Improve wording. String change! (#355128, David Lodge)

[~andy/gtk] / gtk / gtkpreview.c

diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c
index bfd9379584189eab0a8b3eb9b397edd03c3d8429..736c1bca12bf66be6bc2402e5ad229bab527b27e 100644 (file)
--- a/gtk/gtkpreview.c
+++ b/gtk/gtkpreview.c
@@ -51,8 +51,6 @@ enum {
 };
 
 
-static void   gtk_preview_class_init    (GtkPreviewClass  *klass);
-static void   gtk_preview_init          (GtkPreview       *preview);
 static void   gtk_preview_set_property  (GObject          *object,
                                         guint             prop_id,
                                         const GValue     *value,
@@ -70,48 +68,20 @@ static gint   gtk_preview_expose        (GtkWidget        *widget,
 static void   gtk_preview_make_buffer   (GtkPreview       *preview);
 static void   gtk_fill_lookup_array     (guchar           *array);
 
-static GtkWidgetClass *parent_class = NULL;
 static GtkPreviewClass *preview_class = NULL;
 static gint install_cmap = FALSE;
 
 
-GtkType
-gtk_preview_get_type (void)
-{
-  static GtkType preview_type = 0;
-
-  if (!preview_type)
-    {
-      static const GtkTypeInfo preview_info =
-      {
-        "GtkPreview",
-        sizeof (GtkPreview),
-        sizeof (GtkPreviewClass),
-        (GtkClassInitFunc) gtk_preview_class_init,
-        (GtkObjectInitFunc) gtk_preview_init,
-       /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      g_intern_static_string ("GtkPreview");
-      preview_type = gtk_type_unique (GTK_TYPE_WIDGET, &preview_info);
-    }
-
-  return preview_type;
-}
+G_DEFINE_TYPE (GtkPreview, gtk_preview, GTK_TYPE_WIDGET)
 
 static void
 gtk_preview_class_init (GtkPreviewClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
 
-  object_class = (GtkObjectClass*) klass;
   widget_class = (GtkWidgetClass*) klass;
 
-  parent_class = gtk_type_class (GTK_TYPE_WIDGET);
   preview_class = klass;
 
   gobject_class->finalize = gtk_preview_finalize;
@@ -247,7 +217,6 @@ gtk_preview_put (GtkPreview   *preview,
                 gint          width,
                 gint          height)
 {
-  GtkWidget *widget;
   GdkRectangle r1, r2, r3;
   guchar *src;
   guint bpp;
@@ -259,8 +228,6 @@ gtk_preview_put (GtkPreview   *preview,
   if (!preview->buffer)
     return;
 
-  widget = GTK_WIDGET (preview);
-
   r1.x = 0;
   r1.y = 0;
   r1.width = preview->buffer_width;
@@ -453,7 +420,7 @@ gtk_preview_finalize (GObject *object)
     g_free (preview->buffer);
   preview->type = (GtkPreviewType) -1;
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (gtk_preview_parent_class)->finalize (object);
 }
 
 static void