remove some explicit #defines of PROFILE_FILE_CHOOSER because they break

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

diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 1bdb8560e649a75fc8ae2826acfd94840256a814..992ebcf550658db579ebc3c57e4ccd6a9771ece9 100644 (file)
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -2,21 +2,32 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * 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);
@@ -27,26 +38,29 @@ static void gtk_drawing_area_size_allocate (GtkWidget           *widget,
 static void gtk_drawing_area_send_configure (GtkDrawingArea     *darea);
 
 
-guint
+GType
 gtk_drawing_area_get_type (void)
 {
-  static guint drawing_area_type = 0;
+  static GType drawing_area_type = 0;
 
   if (!drawing_area_type)
     {
-      static const GtkTypeInfo drawing_area_info =
+      static const GTypeInfo 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,
+       NULL,           /* base_init */
+       NULL,           /* base_finalize */
+       (GClassInitFunc) gtk_drawing_area_class_init,
+       NULL,           /* class_finalize */
+       NULL,           /* class_data */
+       sizeof (GtkDrawingArea),
+       0,              /* n_preallocs */
+       (GInstanceInitFunc) gtk_drawing_area_init,
       };
 
-      drawing_area_type = gtk_type_unique (gtk_widget_get_type (), &drawing_area_info);
+      drawing_area_type =
+       g_type_register_static (GTK_TYPE_WIDGET, I_("GtkDrawingArea"),
+                               &drawing_area_info, 0);
     }
 
   return drawing_area_type;
@@ -55,9 +69,7 @@ gtk_drawing_area_get_type (void)
 static void
 gtk_drawing_area_class_init (GtkDrawingAreaClass *class)
 {
-  GtkWidgetClass *widget_class;
-
-  widget_class = (GtkWidgetClass*) class;
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
   widget_class->realize = gtk_drawing_area_realize;
   widget_class->size_allocate = gtk_drawing_area_size_allocate;
@@ -73,7 +85,7 @@ gtk_drawing_area_init (GtkDrawingArea *darea)
 GtkWidget*
 gtk_drawing_area_new (void)
 {
-  return GTK_WIDGET (gtk_type_new (gtk_drawing_area_get_type ()));
+  return g_object_new (GTK_TYPE_DRAWING_AREA, NULL);
 }
 
 void
@@ -81,11 +93,12 @@ gtk_drawing_area_size (GtkDrawingArea *darea,
                       gint            width,
                       gint            height)
 {
-  g_return_if_fail (darea != NULL);
   g_return_if_fail (GTK_IS_DRAWING_AREA (darea));
 
   GTK_WIDGET (darea)->requisition.width = width;
   GTK_WIDGET (darea)->requisition.height = height;
+
+  gtk_widget_queue_resize (GTK_WIDGET (darea));
 }
 
 static void
@@ -95,7 +108,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);
@@ -126,7 +138,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);
 
@@ -146,16 +157,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.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"