compile fixes for Python 2.5

[wxWidgets.git] / src / gtk / win_gtk.c

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 58b2ec367bb93a50950b40e1d86b6ba58f5841b3..4862d3b4936570622da956ab913d98be2ae72af7 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,32 +1,26 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////

-// Name:        win_gtk.c
-// Purpose:     Native GTK+ widget for wxWindows, based on GtkLayout and
+// Name:        src/gtk/win_gtk.c
+// Purpose:     Native GTK+ widget for wxWidgets, based on GtkLayout and

 //              GtkFixed. It makes use of the gravity window property and
 //              therefore does not work with GTK 1.0.
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 //              GtkFixed. It makes use of the gravity window property and
 //              therefore does not work with GTK 1.0.
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////// */
 
 /////////////////////////////////////////////////////////////////////////// */
 

+#ifdef VMS
+#define XCheckIfEvent XCHECKIFEVENT
+#endif
+
+#include "wx/platform.h"

 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/win_gtk.h"

-#include "gtk/gtksignal.h"
-#include "gtk/gtkprivate.h"
-#include "gdk/gdkx.h"

 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 

-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-
-#define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
-                          (y >= G_MINSHORT) && (y <= G_MAXSHORT))
-

 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;
 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;

-typedef struct _GtkPizzaChild    GtkPizzaChild;

 
 struct _GtkPizzaAdjData
 {
 
 struct _GtkPizzaAdjData
 {


@@ -34,102 +28,109 @@ struct _GtkPizzaAdjData
     gint dy;
 };
 
     gint dy;
 };
 

-struct _GtkPizzaChild
-{
-    GtkWidget *widget;
-    gint x;
-    gint y;
-    gint width;
-    gint height;
-};
+static void gtk_pizza_class_init    (GtkPizzaClass    *klass);
+static void gtk_pizza_init          (GtkPizza         *pizza);

 
 

-static void gtk_pizza_class_init      (GtkPizzaClass  *klass);
-static void gtk_pizza_init            (GtkPizza       *pizza);
+static void gtk_pizza_realize       (GtkWidget        *widget);
+static void gtk_pizza_unrealize     (GtkWidget        *widget);

 
 

-static void gtk_pizza_realize         (GtkWidget        *widget);
-static void gtk_pizza_unrealize       (GtkWidget        *widget);
-
-static void gtk_pizza_map             (GtkWidget        *widget);
+static void gtk_pizza_map           (GtkWidget        *widget);

 
 static void gtk_pizza_size_request  (GtkWidget        *widget,
                                      GtkRequisition   *requisition);
 static void gtk_pizza_size_allocate (GtkWidget        *widget,
                                      GtkAllocation    *allocation);
 
 static void gtk_pizza_size_request  (GtkWidget        *widget,
                                      GtkRequisition   *requisition);
 static void gtk_pizza_size_allocate (GtkWidget        *widget,
                                      GtkAllocation    *allocation);

-static void gtk_pizza_draw          (GtkWidget        *widget,
-                                     GdkRectangle     *area);

 static gint gtk_pizza_expose        (GtkWidget        *widget,
                                      GdkEventExpose   *event);
 static gint gtk_pizza_expose        (GtkWidget        *widget,
                                      GdkEventExpose   *event);

+static void gtk_pizza_style_set     (GtkWidget *widget,
+                                     GtkStyle  *previous_style);

 static void gtk_pizza_add           (GtkContainer     *container,
                                      GtkWidget        *widget);
 static void gtk_pizza_remove        (GtkContainer     *container,
                                      GtkWidget        *widget);
 static void gtk_pizza_add           (GtkContainer     *container,
                                      GtkWidget        *widget);
 static void gtk_pizza_remove        (GtkContainer     *container,
                                      GtkWidget        *widget);

-static void gtk_pizza_forall       (GtkContainer     *container,
-                                     gboolean              include_internals,
-                                     GtkCallback      callback,
-                                     gpointer         callback_data);
+static void gtk_pizza_forall        (GtkContainer     *container,
+                                     gboolean          include_internals,
+                                     GtkCallback       callback,
+                                     gpointer          callback_data);

 
 

-static void     gtk_pizza_position_child     (GtkPizza      *pizza,
-                                               GtkPizzaChild *child);

 static void     gtk_pizza_allocate_child     (GtkPizza      *pizza,
 static void     gtk_pizza_allocate_child     (GtkPizza      *pizza,

-                                               GtkPizzaChild *child);
-static void     gtk_pizza_position_children  (GtkPizza      *pizza);
-
+                                              GtkPizzaChild *child);

 static void     gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
 static void     gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,

-                                                       gpointer   cb_data);
-static void     gtk_pizza_adjust_allocations         (GtkPizza *pizza,
-                                                       gint       dx,
-                                                       gint       dy);
-
-
-static void     gtk_pizza_expose_area        (GtkPizza      *pizza,
-                                               gint            x,
-                                               gint            y,
-                                               gint            width,
-                                               gint            height);
-static void     gtk_pizza_adjustment_changed (GtkAdjustment  *adjustment,
-                                               GtkPizza      *pizza);
-static GdkFilterReturn gtk_pizza_filter      (GdkXEvent      *gdk_xevent,
-                                               GdkEvent       *event,
-                                               gpointer        data);
-static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent      *gdk_xevent,
-                                               GdkEvent       *event,
-                                               gpointer        data);
-
+                                                      gpointer   cb_data);

 
 static GtkType gtk_pizza_child_type (GtkContainer     *container);
 
 
 static GtkType gtk_pizza_child_type (GtkContainer     *container);
 

-static void  gtk_pizza_scroll_set_adjustments    (GtkPizza   *pizza,
+static void  gtk_pizza_scroll_set_adjustments (GtkPizza      *pizza,

                                                GtkAdjustment *hadj,
                                                GtkAdjustment *vadj);
 
                                                GtkAdjustment *hadj,
                                                GtkAdjustment *vadj);
 

+/* static */
+GtkContainerClass *pizza_parent_class = NULL;

 
 

-static GtkContainerClass *parent_class = NULL;
-static gboolean gravity_works;
-
-guint
+GtkType

 gtk_pizza_get_type ()
 {
 gtk_pizza_get_type ()
 {

-    static guint pizza_type = 0;
+    static GtkType pizza_type = 0;

 
     if (!pizza_type)
     {
 
     if (!pizza_type)
     {

-        GtkTypeInfo pizza_info =
+        static const GTypeInfo pizza_info =

         {
         {

-           "GtkPizza",
-           sizeof (GtkPizza),
-           sizeof (GtkPizzaClass),
-           (GtkClassInitFunc) gtk_pizza_class_init,
-           (GtkObjectInitFunc) gtk_pizza_init,
-           /* reserved_1 */ NULL,
-           /* reserved_2 */ NULL,
-           (GtkClassInitFunc) NULL,
+            sizeof (GtkPizzaClass),
+            NULL,           /* base_init */
+            NULL,           /* base_finalize */
+            (GClassInitFunc) gtk_pizza_class_init,
+            NULL,           /* class_finalize */
+            NULL,           /* class_data */
+            sizeof (GtkPizza),
+            16,             /* n_preallocs */
+            (GInstanceInitFunc) gtk_pizza_init,

         };
         };

-        pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info);
+        pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, (GTypeFlags)0);

     }
 
     return pizza_type;
 }
 
     }
 
     return pizza_type;
 }
 

+/* Marshaller needed for set_scroll_adjustments signal,
+   generated with GLib-2.4.6 glib-genmarshal */
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+static void
+g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+                                             GValue       *return_value,
+                                             guint         n_param_values,
+                                             const GValue *param_values,
+                                             gpointer      invocation_hint,
+                                             gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer     data1,
+                                                    gpointer     arg_1,
+                                                    gpointer     arg_2,
+                                                    gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_OBJECT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);
+}
+

 static void
 gtk_pizza_class_init (GtkPizzaClass *klass)
 {
 static void
 gtk_pizza_class_init (GtkPizzaClass *klass)
 {


@@ -140,15 +141,15 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
     object_class = (GtkObjectClass*) klass;
     widget_class = (GtkWidgetClass*) klass;
     container_class = (GtkContainerClass*) klass;
     object_class = (GtkObjectClass*) klass;
     widget_class = (GtkWidgetClass*) klass;
     container_class = (GtkContainerClass*) klass;

-    parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
+    pizza_parent_class = gtk_type_class (GTK_TYPE_CONTAINER);

 
     widget_class->map = gtk_pizza_map;
     widget_class->realize = gtk_pizza_realize;
     widget_class->unrealize = gtk_pizza_unrealize;
     widget_class->size_request = gtk_pizza_size_request;
     widget_class->size_allocate = gtk_pizza_size_allocate;
 
     widget_class->map = gtk_pizza_map;
     widget_class->realize = gtk_pizza_realize;
     widget_class->unrealize = gtk_pizza_unrealize;
     widget_class->size_request = gtk_pizza_size_request;
     widget_class->size_allocate = gtk_pizza_size_allocate;

-    widget_class->draw = gtk_pizza_draw;

     widget_class->expose_event = gtk_pizza_expose;
     widget_class->expose_event = gtk_pizza_expose;

+    widget_class->style_set = gtk_pizza_style_set;

 
     container_class->add = gtk_pizza_add;
     container_class->remove = gtk_pizza_remove;
 
     container_class->add = gtk_pizza_add;
     container_class->remove = gtk_pizza_remove;


@@ -159,12 +160,18 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
     klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments;
 
     widget_class->set_scroll_adjustments_signal =
     klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments;
 
     widget_class->set_scroll_adjustments_signal =

-    gtk_signal_new ("set_scroll_adjustments",
-                    GTK_RUN_LAST,
-                    object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments),
-                    gtk_marshal_NONE__POINTER_POINTER,
-                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+        g_signal_new(
+            "set_scroll_adjustments",
+            G_TYPE_FROM_CLASS(object_class),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET(GtkPizzaClass, set_scroll_adjustments),
+            NULL,
+            NULL,
+            g_cclosure_user_marshal_VOID__OBJECT_OBJECT,
+            G_TYPE_NONE,
+            2,
+            GTK_TYPE_ADJUSTMENT,
+            GTK_TYPE_ADJUSTMENT);

 }
 
 static GtkType
 }
 
 static GtkType


@@ -187,13 +194,13 @@ gtk_pizza_init (GtkPizza *pizza)
 
     pizza->bin_window = NULL;
 
 
     pizza->bin_window = NULL;
 

-    pizza->configure_serial = 0;
+    pizza->xoffset = 0;
+    pizza->yoffset = 0;
+

     pizza->scroll_x = 0;
     pizza->scroll_y = 0;
     pizza->scroll_x = 0;
     pizza->scroll_y = 0;

-    pizza->visibility = GDK_VISIBILITY_PARTIAL;

 
 

-    pizza->clear_on_draw = TRUE;
-    pizza->use_filter = FALSE;
+    pizza->external_expose = FALSE;

 }
 
 GtkWidget*
 }
 
 GtkWidget*


@@ -201,7 +208,7 @@ gtk_pizza_new ()
 {
     GtkPizza *pizza;
 
 {
     GtkPizza *pizza;
 

-    pizza = gtk_type_new (gtk_pizza_get_type ());
+    pizza = g_object_new (gtk_pizza_get_type (), NULL);

 
     return GTK_WIDGET (pizza);
 }
 
     return GTK_WIDGET (pizza);
 }


@@ -215,13 +222,13 @@ gtk_pizza_scroll_set_adjustments (GtkPizza     *pizza,
 }
 
 void
 }
 
 void

-gtk_pizza_set_shadow_type (GtkPizza      *pizza,
+gtk_pizza_set_shadow_type (GtkPizza        *pizza,

                            GtkMyShadowType  type)
 {
     g_return_if_fail (pizza != NULL);
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 
                            GtkMyShadowType  type)
 {
     g_return_if_fail (pizza != NULL);
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 

-    if ((GtkMyShadowType) pizza->shadow_type != type)
+    if (pizza->shadow_type != type)

     {
         pizza->shadow_type = type;
 
     {
         pizza->shadow_type = type;
 


@@ -234,32 +241,22 @@ gtk_pizza_set_shadow_type (GtkPizza      *pizza,
 }
 
 void
 }
 
 void

-gtk_pizza_set_clear (GtkPizza     *pizza,
-                     gboolean        clear)
+gtk_pizza_set_external (GtkPizza  *pizza,
+                        gboolean   expose)

 {
     g_return_if_fail (pizza != NULL);
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 
 {
     g_return_if_fail (pizza != NULL);
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 

-    pizza->clear_on_draw = clear;
+    pizza->external_expose = expose;

 }
 
 }
 

-void       
-gtk_pizza_set_filter (GtkPizza          *pizza,
-                      gboolean           use)
-{
-    g_return_if_fail (pizza != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (pizza));
-
-    pizza->use_filter = use;
-}      
-                                       

 void
 void

-gtk_pizza_put (GtkPizza    *pizza,
-                 GtkWidget     *widget,
-                 gint         x,
-                 gint         y,
-                 gint         width,
-                 gint         height)
+gtk_pizza_put (GtkPizza   *pizza,
+               GtkWidget  *widget,
+               gint        x,
+               gint        y,
+               gint        width,
+               gint        height)

 {
     GtkPizzaChild *child_info;
 
 {
     GtkPizzaChild *child_info;
 


@@ -277,71 +274,21 @@ gtk_pizza_put (GtkPizza    *pizza,
 
     pizza->children = g_list_append (pizza->children, child_info);
 
 
     pizza->children = g_list_append (pizza->children, child_info);
 

-    gtk_widget_set_parent (widget, GTK_WIDGET (pizza));
-

     if (GTK_WIDGET_REALIZED (pizza))
       gtk_widget_set_parent_window (widget, pizza->bin_window);
 
     if (GTK_WIDGET_REALIZED (pizza))
       gtk_widget_set_parent_window (widget, pizza->bin_window);
 

-    if (!IS_ONSCREEN (x, y))
-       GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
-
-/*
-    if (GTK_WIDGET_REALIZED (pizza))
-        gtk_widget_realize (widget);
-*/
-
-    gtk_widget_set_usize (widget, width, height);
-
-/*
-    if (GTK_WIDGET_VISIBLE (pizza) && GTK_WIDGET_VISIBLE (widget))
-    {
-        if (GTK_WIDGET_MAPPED (pizza))
-            gtk_widget_map (widget);
-
-        gtk_widget_queue_resize (widget);
-    }
-*/
-}
-
-void
-gtk_pizza_move (GtkPizza    *pizza,
-                  GtkWidget     *widget,
-                  gint         x,
-                  gint         y)
-{
-    GtkPizzaChild *child;
-    GList *children;
-
-    g_return_if_fail (pizza != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (pizza));
-    g_return_if_fail (widget != NULL);
-
-    children = pizza->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
-
-        if (child->widget == widget)
-        {
-            if ((child->x == x) && (child->y == y))
-                break;
-
-            child->x = x;
-            child->y = y;
+    gtk_widget_set_parent (widget, GTK_WIDGET (pizza));

 
 

-            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
-                gtk_widget_queue_resize (widget);
-            break;
-        }
-    }
+    gtk_widget_set_size_request (widget, width, height);

 }
 
 void
 }
 
 void

-gtk_pizza_resize (GtkPizza     *pizza,
-                    GtkWidget      *widget,
-                    gint         width,
-                    gint         height)
+gtk_pizza_set_size (GtkPizza   *pizza,
+                    GtkWidget  *widget,
+                    gint        x,
+                    gint        y,
+                    gint        width,
+                    gint        height)

 {
     GtkPizzaChild *child;
     GList *children;
 {
     GtkPizzaChild *child;
     GList *children;


@@ -350,43 +297,15 @@ gtk_pizza_resize (GtkPizza     *pizza,
     g_return_if_fail (GTK_IS_PIZZA (pizza));
     g_return_if_fail (widget != NULL);
 
     g_return_if_fail (GTK_IS_PIZZA (pizza));
     g_return_if_fail (widget != NULL);
 

-    children = pizza->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
-
-        if (child->widget == widget)
-        {
-            if ((child->width == width) && (child->height == height))
-                break;
-
-            child->width = width;
-            child->height = height;
-
-            gtk_widget_set_usize (widget, width, height);
-
-            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
-                gtk_widget_queue_resize (widget);
-            break;
-        }
-    }
-}
-
-void
-gtk_pizza_set_size (GtkPizza    *pizza,
-                      GtkWidget     *widget,
-                      gint        x,
-                      gint         y,
-                      gint         width,
-                      gint         height)
-{
-    GtkPizzaChild *child;
-    GList *children;
-
-    g_return_if_fail (pizza != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (pizza));
-    g_return_if_fail (widget != NULL);
+#ifndef WX_WARN_ILLEGAL_SETSIZE
+    /* this really shouldn't happen -- but it does, a lot, right now and we
+       can't pass negative values to gtk_widget_set_size_request() without getting
+       a warning printed out, so filter them out here */
+    if ( width < 0 )
+        width = 0;
+    if ( height < 0 )
+        height = 0;
+#endif

 
     children = pizza->children;
     while (children)
 
     children = pizza->children;
     while (children)


@@ -406,7 +325,7 @@ gtk_pizza_set_size (GtkPizza    *pizza,
             child->width = width;
             child->height = height;
 
             child->width = width;
             child->height = height;
 

-            gtk_widget_set_usize (widget, width, height);
+            gtk_widget_set_size_request (widget, width, height);

 
             if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
                 gtk_widget_queue_resize (widget);
 
             if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
                 gtk_widget_queue_resize (widget);


@@ -436,8 +355,7 @@ gtk_pizza_map (GtkWidget *widget)
         children = children->next;
 
         if ( GTK_WIDGET_VISIBLE (child->widget) &&
         children = children->next;
 
         if ( GTK_WIDGET_VISIBLE (child->widget) &&

-            !GTK_WIDGET_MAPPED (child->widget) &&
-            !GTK_WIDGET_IS_OFFSCREEN (child->widget))
+            !GTK_WIDGET_MAPPED (child->widget) )

         {
             gtk_widget_map (child->widget);
         }
         {
             gtk_widget_map (child->widget);
         }


@@ -460,7 +378,6 @@ gtk_pizza_realize (GtkWidget *widget)
     g_return_if_fail (GTK_IS_PIZZA (widget));
 
     pizza = GTK_PIZZA (widget);
     g_return_if_fail (GTK_IS_PIZZA (widget));
 
     pizza = GTK_PIZZA (widget);

-

     GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
     attributes.window_type = GDK_WINDOW_CHILD;
     GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
     attributes.window_type = GDK_WINDOW_CHILD;


@@ -470,18 +387,20 @@ gtk_pizza_realize (GtkWidget *widget)
     attributes.width = widget->allocation.width;
     attributes.height = widget->allocation.height;
 
     attributes.width = widget->allocation.width;
     attributes.height = widget->allocation.height;
 

+#ifndef __WXUNIVERSAL__

     if (pizza->shadow_type == GTK_MYSHADOW_NONE)
     {
         /* no border, no changes to sizes */
     if (pizza->shadow_type == GTK_MYSHADOW_NONE)
     {
         /* no border, no changes to sizes */

-    } else
-    if (pizza->shadow_type == GTK_MYSHADOW_THIN)
+    }
+    else if (pizza->shadow_type == GTK_MYSHADOW_THIN)

     {
         /* GTK_MYSHADOW_THIN == wxSIMPLE_BORDER */
         attributes.x += 1;
         attributes.y += 1;
         attributes.width -= 2;
         attributes.height -= 2;
     {
         /* GTK_MYSHADOW_THIN == wxSIMPLE_BORDER */
         attributes.x += 1;
         attributes.y += 1;
         attributes.width -= 2;
         attributes.height -= 2;

-    } else
+    }
+    else

     {
         /* GTK_MYSHADOW_IN == wxSUNKEN_BORDER */
         /* GTK_MYSHADOW_OUT == wxRAISED_BORDER */
     {
         /* GTK_MYSHADOW_IN == wxSUNKEN_BORDER */
         /* GTK_MYSHADOW_OUT == wxRAISED_BORDER */


@@ -490,6 +409,7 @@ gtk_pizza_realize (GtkWidget *widget)
         attributes.width -= 4;
         attributes.height -= 4;
     }
         attributes.width -= 4;
         attributes.height -= 4;
     }

+#endif /* __WXUNIVERSAL__ */

 
     /* minimal size */
     if (attributes.width < 2) attributes.width = 2;
 
     /* minimal size */
     if (attributes.width < 2) attributes.width = 2;


@@ -498,8 +418,7 @@ gtk_pizza_realize (GtkWidget *widget)
     attributes.wclass = GDK_INPUT_OUTPUT;
     attributes.visual = gtk_widget_get_visual (widget);
     attributes.colormap = gtk_widget_get_colormap (widget);
     attributes.wclass = GDK_INPUT_OUTPUT;
     attributes.visual = gtk_widget_get_visual (widget);
     attributes.colormap = gtk_widget_get_colormap (widget);

-    attributes.event_mask =
-       GDK_VISIBILITY_NOTIFY_MASK;
+    attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK;

     attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
     widget->window = gdk_window_new(gtk_widget_get_parent_window (widget),
     attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
     widget->window = gdk_window_new(gtk_widget_get_parent_window (widget),


@@ -510,21 +429,21 @@ gtk_pizza_realize (GtkWidget *widget)
     attributes.y = 0;
 
     attributes.event_mask = gtk_widget_get_events (widget);
     attributes.y = 0;
 
     attributes.event_mask = gtk_widget_get_events (widget);

-    attributes.event_mask |=
-       GDK_EXPOSURE_MASK        |
-       GDK_POINTER_MOTION_MASK        |
-       GDK_POINTER_MOTION_HINT_MASK  |
-       GDK_BUTTON_MOTION_MASK        |
-       GDK_BUTTON1_MOTION_MASK        |
-       GDK_BUTTON2_MOTION_MASK        |
-       GDK_BUTTON3_MOTION_MASK        |
-       GDK_BUTTON_PRESS_MASK        |
-       GDK_BUTTON_RELEASE_MASK        |
-       GDK_KEY_PRESS_MASK        |
-       GDK_KEY_RELEASE_MASK        |
-       GDK_ENTER_NOTIFY_MASK        |
-       GDK_LEAVE_NOTIFY_MASK        |
-       GDK_FOCUS_CHANGE_MASK;
+    attributes.event_mask |= GDK_EXPOSURE_MASK              |
+                             GDK_SCROLL_MASK                |
+                             GDK_POINTER_MOTION_MASK        |
+                             GDK_POINTER_MOTION_HINT_MASK   |
+                             GDK_BUTTON_MOTION_MASK         |
+                             GDK_BUTTON1_MOTION_MASK        |
+                             GDK_BUTTON2_MOTION_MASK        |
+                             GDK_BUTTON3_MOTION_MASK        |
+                             GDK_BUTTON_PRESS_MASK          |
+                             GDK_BUTTON_RELEASE_MASK        |
+                             GDK_KEY_PRESS_MASK             |
+                             GDK_KEY_RELEASE_MASK           |
+                             GDK_ENTER_NOTIFY_MASK          |
+                             GDK_LEAVE_NOTIFY_MASK          |
+                             GDK_FOCUS_CHANGE_MASK;

 
     pizza->bin_window = gdk_window_new(widget->window,
                                           &attributes, attributes_mask);
 
     pizza->bin_window = gdk_window_new(widget->window,
                                           &attributes, attributes_mask);


@@ -532,14 +451,12 @@ gtk_pizza_realize (GtkWidget *widget)
 
     widget->style = gtk_style_attach (widget->style, widget->window);
     gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
 
     widget->style = gtk_style_attach (widget->style, widget->window);
     gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);

-    gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL);
-
-    /* add filters for intercepting visibility and expose events */
-    gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza);
-    gdk_window_add_filter (pizza->bin_window, gtk_pizza_filter, pizza);
+    gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL );

 
 

-    /* we NEED gravity or we'll give up */
-    gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE);
+/*
+    gdk_window_set_back_pixmap( widget->window, NULL, FALSE );
+    gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
+*/

 
     /* cannot be done before realisation */
     children = pizza->children;
 
     /* cannot be done before realisation */
     children = pizza->children;


@@ -555,24 +472,24 @@ gtk_pizza_realize (GtkWidget *widget)
 static void
 gtk_pizza_unrealize (GtkWidget *widget)
 {
 static void
 gtk_pizza_unrealize (GtkWidget *widget)
 {

-  GtkPizza *pizza;
+    GtkPizza *pizza;

 
 

-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_PIZZA (widget));
+    g_return_if_fail (widget != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (widget));

 
 

-  pizza = GTK_PIZZA (widget);
+    pizza = GTK_PIZZA (widget);

 
 

-  gdk_window_set_user_data (pizza->bin_window, NULL);
-  gdk_window_destroy (pizza->bin_window);
-  pizza->bin_window = NULL;
+    gdk_window_set_user_data (pizza->bin_window, NULL);
+    gdk_window_destroy (pizza->bin_window);
+    pizza->bin_window = NULL;

 
 

-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+    if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize)
+       (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget);

 }
 
 static void
 gtk_pizza_size_request (GtkWidget      *widget,
 }
 
 static void
 gtk_pizza_size_request (GtkWidget      *widget,

-                          GtkRequisition *requisition)
+                        GtkRequisition *requisition)

 {
     GtkPizza *pizza;
     GtkPizzaChild *child;
 {
     GtkPizza *pizza;
     GtkPizzaChild *child;


@@ -605,7 +522,7 @@ gtk_pizza_size_request (GtkWidget      *widget,
 
 static void
 gtk_pizza_size_allocate (GtkWidget     *widget,
 
 static void
 gtk_pizza_size_allocate (GtkWidget     *widget,

-                           GtkAllocation *allocation)
+                         GtkAllocation *allocation)

 {
     GtkPizza *pizza;
     gint border;
 {
     GtkPizza *pizza;
     gint border;


@@ -646,51 +563,15 @@ gtk_pizza_size_allocate (GtkWidget     *widget,
         child = children->data;
         children = children->next;
 
         child = children->data;
         children = children->next;
 

-        gtk_pizza_position_child (pizza, child);

         gtk_pizza_allocate_child (pizza, child);
     }
 }
 
         gtk_pizza_allocate_child (pizza, child);
     }
 }
 

-static void
-gtk_pizza_draw (GtkWidget    *widget,
-                  GdkRectangle *area)
-{
-    GtkPizza *pizza;
-    GtkPizzaChild *child;
-    GdkRectangle child_area;
-    GList *children;
-
-    g_return_if_fail (widget != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (widget));
-
-    pizza = GTK_PIZZA (widget);
-
-    children = pizza->children;
-    if ( !(GTK_WIDGET_APP_PAINTABLE (widget)) &&
-         (pizza->clear_on_draw))
-    {
-        gdk_window_clear_area( pizza->bin_window,
-                                area->x, area->y, area->width, area->height);
-    }
-
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
-
-        if (gtk_widget_intersect (child->widget, area, &child_area))
-            gtk_widget_draw (child->widget, &child_area);
-    }
-}
-

 static gint
 gtk_pizza_expose (GtkWidget      *widget,
 static gint
 gtk_pizza_expose (GtkWidget      *widget,

-                    GdkEventExpose *event)
+                  GdkEventExpose *event)

 {
     GtkPizza *pizza;
 {
     GtkPizza *pizza;

-    GtkPizzaChild *child;
-    GdkEventExpose child_event;
-    GList *children;

 
     g_return_val_if_fail (widget != NULL, FALSE);
     g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);
 
     g_return_val_if_fail (widget != NULL, FALSE);
     g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);


@@ -701,23 +582,25 @@ gtk_pizza_expose (GtkWidget      *widget,
     if (event->window != pizza->bin_window)
         return FALSE;
 
     if (event->window != pizza->bin_window)
         return FALSE;
 

-    children = pizza->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
+    /* We handle all expose events in window.cpp now. */
+    if (pizza->external_expose)
+        return FALSE;

 
 

-        child_event = *event;
+    (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event);

 
 

-        if (GTK_WIDGET_NO_WINDOW (child->widget) &&
-            GTK_WIDGET_DRAWABLE (child->widget) &&
-            gtk_widget_intersect (child->widget, &event->area, &child_event.area))
-        {
-            gtk_widget_event (child->widget, (GdkEvent*) &child_event);
-        }
+    return FALSE;
+}
+
+static void
+gtk_pizza_style_set(GtkWidget *widget, GtkStyle  *previous_style)
+{
+    if (GTK_WIDGET_REALIZED(widget))
+    {
+        gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL);
+        gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL );

     }
 
     }
 

-    return FALSE;
+    (* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style);

 }
 
 static void
 }
 
 static void


@@ -733,7 +616,7 @@ gtk_pizza_add (GtkContainer *container,
 
 static void
 gtk_pizza_remove (GtkContainer *container,
 
 static void
 gtk_pizza_remove (GtkContainer *container,

-                    GtkWidget    *widget)
+                  GtkWidget    *widget)

 {
     GtkPizza *pizza;
     GtkPizzaChild *child;
 {
     GtkPizza *pizza;
     GtkPizzaChild *child;


@@ -764,8 +647,6 @@ gtk_pizza_remove (GtkContainer *container,
             /* security checks */
             g_return_if_fail (GTK_IS_WIDGET (widget));
 
             /* security checks */
             g_return_if_fail (GTK_IS_WIDGET (widget));
 

-            GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
-

             break;
         }
 
             break;
         }
 


@@ -775,9 +656,9 @@ gtk_pizza_remove (GtkContainer *container,
 
 static void
 gtk_pizza_forall (GtkContainer *container,
 
 static void
 gtk_pizza_forall (GtkContainer *container,

-                   gboolean         include_internals,
-                   GtkCallback   callback,
-                   gpointer      callback_data)
+                  gboolean      include_internals,
+                  GtkCallback   callback,
+                  gpointer      callback_data)

 {
     GtkPizza *pizza;
     GtkPizzaChild *child;
 {
     GtkPizza *pizza;
     GtkPizzaChild *child;


@@ -785,7 +666,7 @@ gtk_pizza_forall (GtkContainer *container,
 
     g_return_if_fail (container != NULL);
     g_return_if_fail (GTK_IS_PIZZA (container));
 
     g_return_if_fail (container != NULL);
     g_return_if_fail (GTK_IS_PIZZA (container));

-    g_return_if_fail (callback != NULL);
+    g_return_if_fail (callback != (GtkCallback)NULL);

 
     pizza = GTK_PIZZA (container);
 
 
     pizza = GTK_PIZZA (container);
 


@@ -799,45 +680,9 @@ gtk_pizza_forall (GtkContainer *container,
     }
 }
 
     }
 }
 

-
-/* Operations on children
- */
-
-static void
-gtk_pizza_position_child (GtkPizza      *pizza,
-                           GtkPizzaChild *child)
-{
-    gint x;
-    gint y;
-
-    x = child->x - pizza->xoffset;
-    y = child->y - pizza->yoffset;
-
-    if (IS_ONSCREEN (x,y))
-    {
-        if (GTK_WIDGET_MAPPED (pizza) &&
-          GTK_WIDGET_VISIBLE (child->widget))
-        {
-            if (!GTK_WIDGET_MAPPED (child->widget))
-                gtk_widget_map (child->widget);
-        }
-
-        if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
-            GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
-    }
-    else
-    {
-        if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
-            GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
-
-        if (GTK_WIDGET_MAPPED (child->widget))
-            gtk_widget_unmap (child->widget);
-    }
-}
-

 static void
 gtk_pizza_allocate_child (GtkPizza      *pizza,
 static void
 gtk_pizza_allocate_child (GtkPizza      *pizza,

-                           GtkPizzaChild *child)
+                          GtkPizzaChild *child)

 {
     GtkAllocation allocation;
     GtkRequisition requisition;
 {
     GtkAllocation allocation;
     GtkRequisition requisition;


@@ -851,21 +696,6 @@ gtk_pizza_allocate_child (GtkPizza      *pizza,
     gtk_widget_size_allocate (child->widget, &allocation);
 }
 
     gtk_widget_size_allocate (child->widget, &allocation);
 }
 

-static void
-gtk_pizza_position_children (GtkPizza *pizza)
-{
-    GList *tmp_list;
-
-    tmp_list = pizza->children;
-    while (tmp_list)
-    {
-        GtkPizzaChild *child = tmp_list->data;
-        tmp_list = tmp_list->next;
-
-        gtk_pizza_position_child (pizza, child);
-    }
-}
-

 static void
 gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
                                        gpointer   cb_data)
 static void
 gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
                                        gpointer   cb_data)


@@ -913,324 +743,18 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza,
     }
 }
 
     }
 }
 

-/* Callbacks */
-
-/* Send a synthetic expose event to the widget
- */
-static void
-gtk_pizza_expose_area (GtkPizza    *pizza,
-                        gint x, gint y, gint width, gint height)
-{
-    if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED)
-    {
-        GdkEventExpose event;
-
-        event.type = GDK_EXPOSE;
-        event.send_event = TRUE;
-        event.window = pizza->bin_window;
-        event.count = 0;
-
-        event.area.x = x;
-        event.area.y = y;
-        event.area.width = width;
-        event.area.height = height;
-
-        gdk_window_ref (event.window);
-        gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event);
-        gdk_window_unref (event.window);
-    }
-}
-
-/* This function is used to find events to process while scrolling
- */
-
-static Bool
-gtk_pizza_expose_predicate (Display *display,
-                  XEvent  *xevent,
-                  XPointer arg)
-{
-  if ((xevent->type == Expose) ||
-      ((xevent->xany.window == *(Window *)arg) &&
-       (xevent->type == ConfigureNotify)))
-    return True;
-  else
-    return False;
-}
-
-/* This is the main routine to do the scrolling. Scrolling is
- * done by "Guffaw" scrolling, as in the Mozilla XFE, with
- * a few modifications.
- *
- * The main improvement is that we keep track of whether we
- * are obscured or not. If not, we ignore the generated expose
- * events and instead do the exposes ourself, without having
- * to wait for a roundtrip to the server. This also provides
- * a limited form of expose-event compression, since we do
- * the affected area as one big chunk.
- */
-

 void
 gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
 {
 void
 gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
 {

-  GtkWidget *widget;
-  XEvent xevent;
-
-  gint x,y,w,h,border;
+    pizza->xoffset += dx;
+    pizza->yoffset += dy;

 
 

-  widget = GTK_WIDGET (pizza);
-
-  pizza->xoffset += dx;
-  pizza->yoffset += dy;
-
-  if (!GTK_WIDGET_MAPPED (pizza))
-    {
-      gtk_pizza_position_children (pizza);
-      return;
-    }
-
-  gtk_pizza_adjust_allocations (pizza, -dx, -dy);
-
-  if (pizza->shadow_type == GTK_MYSHADOW_NONE)
-    border = 0;
-  else
-  if (pizza->shadow_type == GTK_MYSHADOW_THIN)
-    border = 1;
-  else
-    border = 2;
+    gtk_pizza_adjust_allocations (pizza, -dx, -dy);

 
 

-  x = 0;
-  y = 0;
-  w = widget->allocation.width - 2*border;
-  h = widget->allocation.height - 2*border;
-
-  if (dx > 0)
-    {
-      if (gravity_works)
-        {
-          gdk_window_resize (pizza->bin_window,
-                             w + dx,
-                             h);
-          gdk_window_move   (pizza->bin_window, x-dx, y);
-          gdk_window_move_resize (pizza->bin_window, x, y, w, h );
-        }
-      else
-        {
-          /* FIXME */
-        }
-
-      gtk_pizza_expose_area (pizza,
-                              MAX ((gint)w - dx, 0),
-                              0,
-                              MIN (dx, w),
-                              h);
-    }
-  else if (dx < 0)
-    {
-      if (gravity_works)
-        {
-          gdk_window_move_resize (pizza->bin_window,
-                                  x + dx,
-                                  y,
-                                  w - dx,
-                                  h);
-          gdk_window_move   (pizza->bin_window, x, y);
-          gdk_window_resize (pizza->bin_window, w, h );
-        }
-      else
-        {
-          /* FIXME */
-        }
-
-      gtk_pizza_expose_area (pizza,
-                              0,
-                              0,
-                              MIN (-dx, w),
-                              h);
-    }
-
-  if (dy > 0)
-    {
-      if (gravity_works)
-        {
-          gdk_window_resize (pizza->bin_window, w, h + dy);
-          gdk_window_move   (pizza->bin_window, x, y-dy);
-          gdk_window_move_resize (pizza->bin_window,
-                                  x, y, w, h );
-        }
-      else
-        {
-          /* FIXME */
-        }
-
-      gtk_pizza_expose_area (pizza,
-                              0,
-                              MAX ((gint)h - dy, 0),
-                              w,
-                              MIN (dy, h));
-    }
-  else if (dy < 0)
-    {
-      if (gravity_works)
-        {
-          gdk_window_move_resize (pizza->bin_window,
-                                  x, y+dy, w, h - dy );
-          gdk_window_move   (pizza->bin_window, x, y);
-          gdk_window_resize (pizza->bin_window, w, h );
-        }
-      else
-        {
-          /* FIXME */
-        }
-      gtk_pizza_expose_area (pizza,
-                              0,
-                              0,
-                              w,
-                              MIN (-dy, (gint)h));
-    }
-
-  gtk_pizza_position_children (pizza);
-
-  /* We have to make sure that all exposes from this scroll get
-   * processed before we scroll again, or the expose events will
-   * have invalid coordinates.
-   *
-   * We also do expose events for other windows, since otherwise
-   * their updating will fall behind the scrolling
-   *
-   * This also avoids a problem in pre-1.0 GTK where filters don't
-   * have access to configure events that were compressed.
-   */
-
-  gdk_flush();
-  while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (pizza->bin_window),
-                       &xevent,
-                       gtk_pizza_expose_predicate,
-                       (XPointer)&GDK_WINDOW_XWINDOW (pizza->bin_window)))
-    {
-      GdkEvent event;
-      GtkWidget *event_widget;
-
-      if ((xevent.xany.window == GDK_WINDOW_XWINDOW (pizza->bin_window)) &&
-          (gtk_pizza_filter (&xevent, &event, pizza) == GDK_FILTER_REMOVE))
-        continue;
-
-      if (xevent.type == Expose)
-        {
-          event.expose.window = gdk_window_lookup (xevent.xany.window);
-          gdk_window_get_user_data (event.expose.window,
-                                    (gpointer *)&event_widget);
-
-          if (event_widget)
-            {
-              event.expose.type = GDK_EXPOSE;
-              event.expose.area.x = xevent.xexpose.x;
-              event.expose.area.y = xevent.xexpose.y;
-              event.expose.area.width = xevent.xexpose.width;
-              event.expose.area.height = xevent.xexpose.height;
-              event.expose.count = xevent.xexpose.count;
-
-              gdk_window_ref (event.expose.window);
-              gtk_widget_event (event_widget, &event);
-              gdk_window_unref (event.expose.window);
-            }
-        }
-    }
+    if (pizza->bin_window)
+        gdk_window_scroll( pizza->bin_window, -dx, -dy );

 }
 
 }
 

-/* The main event filter. Actually, we probably don't really need
- * to install this as a filter at all, since we are calling it
- * directly above in the expose-handling hack. But in case scrollbars
- * are fixed up in some manner...
- *
- * This routine identifies expose events that are generated when
- * we've temporarily moved the bin_window_origin, and translates
- * them or discards them, depending on whether we are obscured
- * or not.
- */
-static GdkFilterReturn
-gtk_pizza_filter (GdkXEvent *gdk_xevent,
-                   GdkEvent  *event,
-                   gpointer   data)
-{
-    XEvent *xevent;
-    GtkPizza *pizza;
-
-    xevent = (XEvent *)gdk_xevent;
-    
-    pizza = GTK_PIZZA (data);
-    
-  switch (xevent->type)
-    {
-    case Expose:
-      if (xevent->xexpose.serial == pizza->configure_serial)
-        {
-          if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED)
-            return GDK_FILTER_REMOVE;
-          else
-            {
-              xevent->xexpose.x += pizza->scroll_x;
-              xevent->xexpose.y += pizza->scroll_y;
-
-              break;
-            }
-        }
-      break;
-
-    case ConfigureNotify:
-       if ((xevent->xconfigure.x != 0) || (xevent->xconfigure.y != 0))
-        {
-          pizza->configure_serial = xevent->xconfigure.serial;
-          pizza->scroll_x = xevent->xconfigure.x;
-          pizza->scroll_y = xevent->xconfigure.y;
-        }
-      break;
-    }
-
-    return GDK_FILTER_CONTINUE;
-}
-
-/* Although GDK does have a GDK_VISIBILITY_NOTIFY event,
- * there is no corresponding event in GTK, so we have
- * to get the events from a filter
- */
-static GdkFilterReturn
-gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
-                        GdkEvent  *event,
-                        gpointer   data)
-{
-    XEvent *xevent;
-    GtkPizza *pizza;
-
-    xevent = (XEvent *)gdk_xevent;
-    pizza = GTK_PIZZA (data);
-
-    if (xevent->type == VisibilityNotify)
-    {
-        switch (xevent->xvisibility.state)
-        {
-            case VisibilityFullyObscured:
-                pizza->visibility = GDK_VISIBILITY_FULLY_OBSCURED;
-                break;
-
-            case VisibilityPartiallyObscured:
-                pizza->visibility = GDK_VISIBILITY_PARTIAL;
-                break;
-
-            case VisibilityUnobscured:
-                pizza->visibility = GDK_VISIBILITY_UNOBSCURED;
-                break;
-        }
-        
-        return GDK_FILTER_REMOVE;
-    }
-
-    return GDK_FILTER_CONTINUE;
-}
-
-
-
-

 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

-