cleanup - more reformatting; fixed bug introduced in prior commit

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 96358744c4a3cc5488a8ea1d927533668748dfb5..cd3e794936f2f570530808adcd13221db5264d57 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,12 +1,12 @@
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.c
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.c

-// Purpose:     Native GTK+ widget for wxWindows, based on GtkLayout and
+// 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
 /////////////////////////////////////////////////////////////////////////// */
 
 #ifdef VMS


@@ -23,13 +23,6 @@
 extern "C" {
 #endif /* __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;
 
 struct _GtkPizzaAdjData
 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;
 
 struct _GtkPizzaAdjData


@@ -50,10 +43,10 @@ static void gtk_pizza_size_request  (GtkWidget        *widget,
                                      GtkRequisition   *requisition);
 static void gtk_pizza_size_allocate (GtkWidget        *widget,
                                      GtkAllocation    *allocation);
                                      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,
 static void gtk_pizza_add           (GtkContainer     *container,
                                      GtkWidget        *widget);
 static void gtk_pizza_remove        (GtkContainer     *container,


@@ -63,37 +56,10 @@ static void gtk_pizza_forall        (GtkContainer     *container,
                                      GtkCallback       callback,
                                      gpointer          callback_data);
 
                                      GtkCallback       callback,
                                      gpointer          callback_data);
 

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

 static void     gtk_pizza_allocate_child     (GtkPizza      *pizza,
                                               GtkPizzaChild *child);
 static void     gtk_pizza_allocate_child     (GtkPizza      *pizza,
                                               GtkPizzaChild *child);

-static void     gtk_pizza_position_children  (GtkPizza      *pizza);
-

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

-static void     gtk_pizza_adjust_allocations         (GtkPizza  *pizza,
-                                                      gint       dx,
-                                                      gint       dy);
-
-
-/* unused */
-#if 0
-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);
-#endif
-
-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);
-

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


@@ -101,34 +67,73 @@ 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)
 {


@@ -139,15 +144,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;


@@ -158,17 +163,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,
-
-#ifdef __WXGTK20__
-                    GTK_CLASS_TYPE(object_class),
-#else
-                    object_class->type,
-#endif
-                    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


@@ -295,32 +301,12 @@ 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);
 

-#ifndef __WXGTK20__ /* FIXME? */
-    if (!IS_ONSCREEN (x, y))
-       GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
-#endif
-
-/*
-    if (GTK_WIDGET_REALIZED (pizza))
-        gtk_widget_realize (widget);
-*/
+    gtk_widget_set_parent (widget, GTK_WIDGET (pizza));

 
     gtk_widget_set_usize (widget, width, height);
 
     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
 }
 
 void


@@ -484,11 +470,7 @@ gtk_pizza_map (GtkWidget *widget)
 
         if ( GTK_WIDGET_VISIBLE (child->widget) &&
             !GTK_WIDGET_MAPPED (child->widget) &&
 
         if ( GTK_WIDGET_VISIBLE (child->widget) &&
             !GTK_WIDGET_MAPPED (child->widget) &&

-#ifdef __WXGTK20__

             TRUE)
             TRUE)

-#else
-            !GTK_WIDGET_IS_OFFSCREEN (child->widget))
-#endif

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


@@ -511,7 +493,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;


@@ -521,18 +502,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 */


@@ -541,6 +524,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;


@@ -561,6 +545,7 @@ gtk_pizza_realize (GtkWidget *widget)
 
     attributes.event_mask = gtk_widget_get_events (widget);
     attributes.event_mask |= GDK_EXPOSURE_MASK              |
 
     attributes.event_mask = gtk_widget_get_events (widget);
     attributes.event_mask |= GDK_EXPOSURE_MASK              |

+                             GDK_SCROLL_MASK                |

                              GDK_POINTER_MOTION_MASK        |
                              GDK_POINTER_MOTION_HINT_MASK   |
                              GDK_BUTTON_MOTION_MASK         |
                              GDK_POINTER_MOTION_MASK        |
                              GDK_POINTER_MOTION_HINT_MASK   |
                              GDK_BUTTON_MOTION_MASK         |


@@ -582,19 +567,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);
     gtk_style_set_background (widget->style, pizza->bin_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 );

-    
+

 /*
     gdk_window_set_back_pixmap( widget->window, NULL, FALSE );
     gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
 */
 
 /*
     gdk_window_set_back_pixmap( widget->window, NULL, FALSE );
     gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
 */
 

-    /* 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);
-
-    /* we NEED gravity or we'll give up */
-    gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE);
-

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


@@ -620,8 +598,8 @@ gtk_pizza_unrealize (GtkWidget *widget)
     gdk_window_destroy (pizza->bin_window);
     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
 }
 
 static void


@@ -700,55 +678,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);
-
-    /* Sometimes, We handle all expose events in window.cpp now. */
-    if (pizza->external_expose)
-        return;
-
-    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,
                   GdkEventExpose *event)
 {
     GtkPizza *pizza;
 static gint
 gtk_pizza_expose (GtkWidget      *widget,
                   GdkEventExpose *event)
 {
     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);


@@ -756,30 +694,28 @@ gtk_pizza_expose (GtkWidget      *widget,
 
     pizza = GTK_PIZZA (widget);
 
 
     pizza = GTK_PIZZA (widget);
 

-    /* Sometimes, We handle all expose events in window.cpp now. */
-    if (pizza->external_expose)
+    if (event->window != pizza->bin_window)

         return FALSE;
 
         return FALSE;
 

-    if (event->window != pizza->bin_window)
+    /* We handle all expose events in window.cpp now. */
+    if (pizza->external_expose)

         return FALSE;
 
         return FALSE;
 

-    children = pizza->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
+    (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event);

 
 

-        child_event = *event;
+    return FALSE;
+}

 
 

-        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);
-        }
+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 TRUE;
+    (* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style);

 }
 
 static void
 }
 
 static void


@@ -826,10 +762,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));
 

-#ifndef __WXGTK20__
-            GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
-#endif
-

             break;
         }
 
             break;
         }
 


@@ -849,7 +781,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);
 


@@ -863,46 +795,6 @@ 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);
-        }
-
-#ifndef __WXGTK20__
-        if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
-            GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
-#endif
-    }
-    else
-    {
-#ifndef __WXGTK20__
-        if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
-            GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
-#endif
-
-        if (GTK_WIDGET_MAPPED (child->widget))
-            gtk_widget_unmap (child->widget);
-    }
-}
-

 static void
 gtk_pizza_allocate_child (GtkPizza      *pizza,
                           GtkPizzaChild *child)
 static void
 gtk_pizza_allocate_child (GtkPizza      *pizza,
                           GtkPizzaChild *child)


@@ -919,21 +811,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)


@@ -981,52 +858,6 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza,
     }
 }
 
     }
 }
 

-/* Callbacks */
-
-/* unused */
-#if 0
-/* 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);
-    }
-}
-#endif /* unused */
-
-/* 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
 
 /* This is the main routine to do the scrolling. Scrolling is
  * done by "Guffaw" scrolling, as in the Mozilla XFE, with


@@ -1043,225 +874,15 @@ gtk_pizza_expose_predicate (Display *display,
 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;
-
-    widget = GTK_WIDGET (pizza);
-

     pizza->xoffset += dx;
     pizza->yoffset += dy;
 
     pizza->xoffset += dx;
     pizza->yoffset += dy;
 

-    if (!GTK_WIDGET_MAPPED (pizza))
-    {
-        gtk_pizza_position_children (pizza);
-        return;
-    }
-

     gtk_pizza_adjust_allocations (pizza, -dx, -dy);
 
     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;
-
-    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 */
-        }
-    }
-    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 */
-        }
-    }
-
-    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 */
-        }
-    }
-    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_position_children (pizza);
-
-    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);
-
-        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);
-            }
-        }
-    }
-}
-
-/* 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);
-
-    if (!pizza->use_filter)
-        return GDK_FILTER_CONTINUE;
-
-    switch (xevent->type)
-    {
-        case Expose:
-            if (xevent->xexpose.serial == pizza->configure_serial)
-            {
-                xevent->xexpose.x += pizza->scroll_x;
-                xevent->xexpose.y += pizza->scroll_y;
-            }
-            break;
-
-        case ConfigureNotify:
-            {
-                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 (!pizza->use_filter)
-        return GDK_FILTER_CONTINUE;
-
-    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;
+    if (pizza->bin_window)
+        gdk_window_scroll( pizza->bin_window, -dx, -dy );

 }
 
 }
 

-

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