Estonian translation update by Ivar Smolin.

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

diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 88b2018d91907b40e63f81a7affab1fe806931a1..ef6c22bd9e19ba3dbbcaf88f94004cdfa83eb11d 100644 (file)
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -24,41 +24,18 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include "gtkdrawingarea.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
 
 
-static void gtk_drawing_area_class_init    (GtkDrawingAreaClass *klass);
-static void gtk_drawing_area_init          (GtkDrawingArea      *darea);
 static void gtk_drawing_area_realize       (GtkWidget           *widget);
 static void gtk_drawing_area_size_allocate (GtkWidget           *widget,
                                            GtkAllocation       *allocation);
 static void gtk_drawing_area_send_configure (GtkDrawingArea     *darea);
 
-
-GtkType
-gtk_drawing_area_get_type (void)
-{
-  static GtkType drawing_area_type = 0;
-
-  if (!drawing_area_type)
-    {
-      static const GtkTypeInfo drawing_area_info =
-      {
-       "GtkDrawingArea",
-       sizeof (GtkDrawingArea),
-       sizeof (GtkDrawingAreaClass),
-       (GtkClassInitFunc) gtk_drawing_area_class_init,
-       (GtkObjectInitFunc) gtk_drawing_area_init,
-       /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      drawing_area_type = gtk_type_unique (GTK_TYPE_WIDGET, &drawing_area_info);
-    }
-
-  return drawing_area_type;
-}
+G_DEFINE_TYPE (GtkDrawingArea, gtk_drawing_area, GTK_TYPE_WIDGET)
 
 static void
 gtk_drawing_area_class_init (GtkDrawingAreaClass *class)
@@ -79,7 +56,7 @@ gtk_drawing_area_init (GtkDrawingArea *darea)
 GtkWidget*
 gtk_drawing_area_new (void)
 {
-  return GTK_WIDGET (gtk_type_new (GTK_TYPE_DRAWING_AREA));
+  return g_object_new (GTK_TYPE_DRAWING_AREA, NULL);
 }
 
 void
@@ -102,7 +79,6 @@ gtk_drawing_area_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_DRAWING_AREA (widget));
 
   darea = GTK_DRAWING_AREA (widget);
@@ -133,7 +109,6 @@ static void
 gtk_drawing_area_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_DRAWING_AREA (widget));
   g_return_if_fail (allocation != NULL);
 
@@ -153,17 +128,20 @@ static void
 gtk_drawing_area_send_configure (GtkDrawingArea *darea)
 {
   GtkWidget *widget;
-  GdkEventConfigure event;
+  GdkEvent *event = gdk_event_new (GDK_CONFIGURE);
 
   widget = GTK_WIDGET (darea);
 
-  event.type = GDK_CONFIGURE;
-  event.window = widget->window;
-  event.send_event = TRUE;
-  event.x = widget->allocation.x;
-  event.y = widget->allocation.y;
-  event.width = widget->allocation.width;
-  event.height = widget->allocation.height;
+  event->configure.window = g_object_ref (widget->window);
+  event->configure.send_event = TRUE;
+  event->configure.x = widget->allocation.x;
+  event->configure.y = widget->allocation.y;
+  event->configure.width = widget->allocation.width;
+  event->configure.height = widget->allocation.height;
   
-  gtk_widget_event (widget, (GdkEvent*) &event);
+  gtk_widget_event (widget, event);
+  gdk_event_free (event);
 }
+
+#define __GTK_DRAWING_AREA_C__
+#include "gtkaliasdef.c"