← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gimp/jaunty-security

« back to all changes in this revision

Viewing changes to app/widgets/gimpbrushfactoryview.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2007-05-02 16:33:03 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070502163303-bvzhjzbpw8qglc4y
Tags: 2.3.16-1ubuntu1
* Resynchronized with Debian, remaining Ubuntu changes:
  - debian/rules: i18n magic.
* debian/control.in:
  - Maintainer: Ubuntu Core Developers <ubuntu-devel@lists.ubuntu.com>
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch,
  debian/patches/10_dont_show_wizard.patch: updated.
* debian/patches/04_composite-signedness.patch,
  debian/patches/05_add-letter-spacing.patch: dropped, used upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/widgets/gimpbrushfactoryview.c
1
 
/* The GIMP -- an image manipulation program
 
1
/* GIMP - The GNU Image Manipulation Program
2
2
 * Copyright (C) 1995 Spencer Kimball and Peter Mattis
3
3
 *
4
4
 * gimpbrushfactoryview.c
40
40
#include "gimp-intl.h"
41
41
 
42
42
 
43
 
static void   gimp_brush_factory_view_class_init (GimpBrushFactoryViewClass *klass);
44
 
static void   gimp_brush_factory_view_init       (GimpBrushFactoryView      *view);
45
 
static void   gimp_brush_factory_view_destroy    (GtkObject                *object);
 
43
static void   gimp_brush_factory_view_destroy         (GtkObject            *object);
46
44
 
47
45
static void   gimp_brush_factory_view_select_item     (GimpContainerEditor  *editor,
48
46
                                                       GimpViewable         *viewable);
53
51
                                                       GimpBrushFactoryView *view);
54
52
 
55
53
 
56
 
static GimpDataFactoryViewClass *parent_class = NULL;
57
 
 
58
 
 
59
 
GType
60
 
gimp_brush_factory_view_get_type (void)
61
 
{
62
 
  static GType view_type = 0;
63
 
 
64
 
  if (! view_type)
65
 
    {
66
 
      static const GTypeInfo view_info =
67
 
      {
68
 
        sizeof (GimpBrushFactoryViewClass),
69
 
        NULL,           /* base_init */
70
 
        NULL,           /* base_finalize */
71
 
        (GClassInitFunc) gimp_brush_factory_view_class_init,
72
 
        NULL,           /* class_finalize */
73
 
        NULL,           /* class_data */
74
 
        sizeof (GimpBrushFactoryView),
75
 
        0,              /* n_preallocs */
76
 
        (GInstanceInitFunc) gimp_brush_factory_view_init,
77
 
      };
78
 
 
79
 
      view_type = g_type_register_static (GIMP_TYPE_DATA_FACTORY_VIEW,
80
 
                                          "GimpBrushFactoryView",
81
 
                                          &view_info, 0);
82
 
    }
83
 
 
84
 
  return view_type;
85
 
}
 
54
G_DEFINE_TYPE (GimpBrushFactoryView, gimp_brush_factory_view,
 
55
               GIMP_TYPE_DATA_FACTORY_VIEW)
 
56
 
 
57
#define parent_class gimp_brush_factory_view_parent_class
 
58
 
86
59
 
87
60
static void
88
61
gimp_brush_factory_view_class_init (GimpBrushFactoryViewClass *klass)
89
62
{
90
 
  GtkObjectClass           *object_class;
91
 
  GimpContainerEditorClass *editor_class;
92
 
 
93
 
  object_class = GTK_OBJECT_CLASS (klass);
94
 
  editor_class = GIMP_CONTAINER_EDITOR_CLASS (klass);
95
 
 
96
 
  parent_class = g_type_class_peek_parent (klass);
 
63
  GtkObjectClass           *object_class = GTK_OBJECT_CLASS (klass);
 
64
  GimpContainerEditorClass *editor_class = GIMP_CONTAINER_EDITOR_CLASS (klass);
97
65
 
98
66
  object_class->destroy     = gimp_brush_factory_view_destroy;
99
67
 
119
87
 
120
88
  view->spacing_scale = GIMP_SCALE_ENTRY_SCALE (view->spacing_adjustment);
121
89
 
122
 
  g_signal_connect (view->spacing_adjustment, "value_changed",
 
90
  g_signal_connect (view->spacing_adjustment, "value-changed",
123
91
                    G_CALLBACK (gimp_brush_factory_view_spacing_update),
124
92
                    view);
125
93
 
191
159
                    FALSE, FALSE, 0);
192
160
 
193
161
  factory_view->spacing_changed_handler_id =
194
 
    gimp_container_add_handler (factory->container, "spacing_changed",
 
162
    gimp_container_add_handler (factory->container, "spacing-changed",
195
163
                                G_CALLBACK (gimp_brush_factory_view_spacing_changed),
196
164
                                factory_view);
197
165