Make code compile with unknown value of GDK_WINDOWING

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

diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index 56f9c166fe242b5200f3704ad66c51a2c7c9ef26..fb3775fd9107248009d9fc051663d5f58eff1f66 100644 (file)
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -16,6 +16,14 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  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 "gtksignal.h"
 #include "gtkeventbox.h"
 
@@ -27,10 +35,12 @@ static void gtk_event_box_size_request             (GtkWidget        *widget,
                                                    GtkRequisition   *requisition);
 static void gtk_event_box_size_allocate            (GtkWidget        *widget,
                                                    GtkAllocation    *allocation);
-static void gtk_event_box_draw                     (GtkWidget    *widget,
-                                                  GdkRectangle *area);
-static gint gtk_event_box_expose                   (GtkWidget      *widget,
-                                                  GdkEventExpose *event);
+static void gtk_event_box_paint                    (GtkWidget         *widget,
+                                                   GdkRectangle      *area);
+static void gtk_event_box_draw                     (GtkWidget         *widget,
+                                                  GdkRectangle       *area);
+static gint gtk_event_box_expose                   (GtkWidget         *widget,
+                                                  GdkEventExpose     *event);
 
 
 GtkType
@@ -40,15 +50,15 @@ gtk_event_box_get_type (void)
 
   if (!event_box_type)
     {
-      GtkTypeInfo event_box_info =
+      static const GtkTypeInfo event_box_info =
       {
        "GtkEventBox",
        sizeof (GtkEventBox),
        sizeof (GtkEventBoxClass),
        (GtkClassInitFunc) gtk_event_box_class_init,
        (GtkObjectInitFunc) gtk_event_box_init,
-       /* reversed_1 */ NULL,
-        /* reversed_2 */ NULL,
+       /* reserved_1 */ NULL,
+        /* reserved_2 */ NULL,
         (GtkClassInitFunc) NULL,
       };
 
@@ -76,7 +86,6 @@ static void
 gtk_event_box_init (GtkEventBox *event_box)
 {
   GTK_WIDGET_UNSET_FLAGS (event_box, GTK_NO_WINDOW);
-  GTK_WIDGET_SET_FLAGS (event_box, GTK_BASIC);
 }
 
 GtkWidget*
@@ -141,10 +150,12 @@ gtk_event_box_size_request (GtkWidget      *widget,
 
   if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
-      gtk_widget_size_request (bin->child, &bin->child->requisition);
+      GtkRequisition child_requisition;
+      
+      gtk_widget_size_request (bin->child, &child_requisition);
 
-      requisition->width += bin->child->requisition.width;
-      requisition->height += bin->child->requisition.height;
+      requisition->width += child_requisition.width;
+      requisition->height += child_requisition.height;
     }
 }
 
@@ -182,9 +193,19 @@ gtk_event_box_size_allocate (GtkWidget     *widget,
     }
 }
 
+static void
+gtk_event_box_paint (GtkWidget    *widget,
+                    GdkRectangle *area)
+{
+  gtk_paint_flat_box (widget->style, widget->window,
+                     widget->state, GTK_SHADOW_NONE,
+                     area, widget, "eventbox",
+                     0, 0, -1, -1);
+}
+
 static void
 gtk_event_box_draw (GtkWidget    *widget,
-                  GdkRectangle *area)
+                   GdkRectangle *area)
 {
   GtkBin *bin;
   GdkRectangle tmp_area;
@@ -199,6 +220,8 @@ gtk_event_box_draw (GtkWidget    *widget,
       tmp_area = *area;
       tmp_area.x -= GTK_CONTAINER (widget)->border_width;
       tmp_area.y -= GTK_CONTAINER (widget)->border_width;
+
+      gtk_event_box_paint (widget, &tmp_area);
       
       if (bin->child)
        {
@@ -223,6 +246,8 @@ gtk_event_box_expose (GtkWidget      *widget,
     {
       bin = GTK_BIN (widget);
 
+      gtk_event_box_paint (widget, &event->area);
+      
       child_event = *event;
       if (bin->child &&
          GTK_WIDGET_NO_WINDOW (bin->child) &&