Added a file

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 44f804dc2d80ac016c58b2c1a4a9b9d50b4a2d15..2f41b1064c65305f1bee0d49d7716acc33cc4626 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -9,6 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 

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

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


@@ -26,7 +31,6 @@ extern "C" {
                           (y >= G_MINSHORT) && (y <= G_MAXSHORT))
 
 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;
                           (y >= G_MINSHORT) && (y <= G_MAXSHORT))
 
 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;

-typedef struct _GtkPizzaChild    GtkPizzaChild;

 
 struct _GtkPizzaAdjData
 {
 
 struct _GtkPizzaAdjData
 {


@@ -34,22 +38,13 @@ 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_request  (GtkWidget        *widget,
                                      GtkRequisition   *requisition);


@@ -63,42 +58,46 @@ static void gtk_pizza_add           (GtkContainer     *container,
                                      GtkWidget        *widget);
 static void gtk_pizza_remove        (GtkContainer     *container,
                                      GtkWidget        *widget);
                                      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,
 
 static void     gtk_pizza_position_child     (GtkPizza      *pizza,

-                                               GtkPizzaChild *child);
+                                              GtkPizzaChild *child);

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

-                                               GtkPizzaChild *child);
+                                              GtkPizzaChild *child);

 static void     gtk_pizza_position_children  (GtkPizza      *pizza);
 
 static void     gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
 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         (GtkPizza *pizza,
-                                                       gint       dx,
-                                                       gint       dy);
-
-
-static void     gtk_pizza_expose_area        (GtkPizza      *pizza,
-                                               gint            x,
-                                               gint            y,
-                                               gint            width,
-                                               gint            height);
+                                                      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,
 static void     gtk_pizza_adjustment_changed (GtkAdjustment  *adjustment,

-                                               GtkPizza      *pizza);
+                                              GtkPizza       *pizza);
+#endif
+

 static GdkFilterReturn gtk_pizza_filter      (GdkXEvent      *gdk_xevent,
 static GdkFilterReturn gtk_pizza_filter      (GdkXEvent      *gdk_xevent,

-                                               GdkEvent       *event,
-                                               gpointer        data);
+                                              GdkEvent       *event,
+                                              gpointer        data);

 static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent      *gdk_xevent,
 static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent      *gdk_xevent,

-                                               GdkEvent       *event,
-                                               gpointer        data);
+                                              GdkEvent       *event,
+                                              gpointer        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);
 


@@ -161,7 +160,12 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
     widget_class->set_scroll_adjustments_signal =
     gtk_signal_new ("set_scroll_adjustments",
                     GTK_RUN_LAST,
     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,
                     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);
                     GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments),
                     gtk_marshal_NONE__POINTER_POINTER,
                     GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);


@@ -186,7 +190,7 @@ gtk_pizza_init (GtkPizza *pizza)
     pizza->height = 20;
 
     pizza->bin_window = NULL;
     pizza->height = 20;
 
     pizza->bin_window = NULL;

-    
+

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


@@ -196,7 +200,8 @@ gtk_pizza_init (GtkPizza *pizza)
     pizza->visibility = GDK_VISIBILITY_PARTIAL;
 
     pizza->clear_on_draw = TRUE;
     pizza->visibility = GDK_VISIBILITY_PARTIAL;
 
     pizza->clear_on_draw = TRUE;

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

 }
 
 GtkWidget*
 }
 
 GtkWidget*


@@ -218,7 +223,7 @@ 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);
                            GtkMyShadowType  type)
 {
     g_return_if_fail (pizza != NULL);


@@ -237,8 +242,8 @@ gtk_pizza_set_shadow_type (GtkPizza      *pizza,
 }
 
 void
 }
 
 void

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

 {
     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));


@@ -246,23 +251,33 @@ gtk_pizza_set_clear (GtkPizza     *pizza,
     pizza->clear_on_draw = clear;
 }
 
     pizza->clear_on_draw = clear;
 }
 

-void       
-gtk_pizza_set_filter (GtkPizza          *pizza,
-                      gboolean           use)
+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;
 {
     g_return_if_fail (pizza != NULL);
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 
     pizza->use_filter = use;

-}      
-                                       
+}
+
+void
+gtk_pizza_set_external (GtkPizza  *pizza,
+                        gboolean   expose)
+{
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));
+
+    pizza->external_expose = expose;
+}
+

 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;
 


@@ -285,8 +300,10 @@ gtk_pizza_put (GtkPizza    *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);
     if (!IS_ONSCREEN (x, y))
        GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);

+#endif

 
 /*
     if (GTK_WIDGET_REALIZED (pizza))
 
 /*
     if (GTK_WIDGET_REALIZED (pizza))


@@ -307,10 +324,10 @@ gtk_pizza_put (GtkPizza    *pizza,
 }
 
 void
 }
 
 void

-gtk_pizza_move (GtkPizza    *pizza,
-                  GtkWidget     *widget,
-                  gint         x,
-                  gint         y)
+gtk_pizza_move (GtkPizza     *pizza,
+                  GtkWidget  *widget,
+                  gint        x,
+                  gint        y)

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


@@ -341,10 +358,10 @@ gtk_pizza_move (GtkPizza    *pizza,
 }
 
 void
 }
 
 void

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

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


@@ -377,12 +394,12 @@ gtk_pizza_resize (GtkPizza     *pizza,
 }
 
 void
 }
 
 void

-gtk_pizza_set_size (GtkPizza    *pizza,
-                      GtkWidget     *widget,
-                      gint        x,
-                      gint         y,
-                      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;


@@ -419,6 +436,33 @@ gtk_pizza_set_size (GtkPizza    *pizza,
     }
 }
 
     }
 }
 

+gint
+gtk_pizza_child_resized  (GtkPizza   *pizza,
+                          GtkWidget  *widget)
+{
+    GtkPizzaChild *child;
+    GList *children;
+
+    g_return_val_if_fail (pizza != NULL, FALSE);
+    g_return_val_if_fail (GTK_IS_PIZZA (pizza), FALSE);
+    g_return_val_if_fail (widget != NULL, FALSE);
+
+    children = pizza->children;
+    while (children)
+    {
+        child = children->data;
+        children = children->next;
+
+        if (child->widget == widget)
+        {
+            return ((child->width == widget->allocation.width) &&
+                    (child->height == widget->allocation.height));
+        }
+    }
+
+    return FALSE;
+}
+

 static void
 gtk_pizza_map (GtkWidget *widget)
 {
 static void
 gtk_pizza_map (GtkWidget *widget)
 {


@@ -440,7 +484,11 @@ 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)
+#else

             !GTK_WIDGET_IS_OFFSCREEN (child->widget))
             !GTK_WIDGET_IS_OFFSCREEN (child->widget))

+#endif

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


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


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


@@ -501,8 +552,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),


@@ -513,21 +563,20 @@ 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_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);


@@ -535,7 +584,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);
+    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 );
+*/

 
     /* add filters for intercepting visibility and expose events */
     gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza);
 
     /* add filters for intercepting visibility and expose events */
     gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza);


@@ -558,24 +612,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 (parent_class)->unrealize)
+       (* GTK_WIDGET_CLASS (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;


@@ -608,7 +662,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;


@@ -656,7 +710,7 @@ gtk_pizza_size_allocate (GtkWidget     *widget,
 
 static void
 gtk_pizza_draw (GtkWidget    *widget,
 
 static void
 gtk_pizza_draw (GtkWidget    *widget,

-                  GdkRectangle *area)
+                GdkRectangle *area)

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


@@ -668,6 +722,10 @@ gtk_pizza_draw (GtkWidget    *widget,
 
     pizza = GTK_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))
     children = pizza->children;
     if ( !(GTK_WIDGET_APP_PAINTABLE (widget)) &&
          (pizza->clear_on_draw))


@@ -688,7 +746,7 @@ gtk_pizza_draw (GtkWidget    *widget,
 
 static gint
 gtk_pizza_expose (GtkWidget      *widget,
 
 static gint
 gtk_pizza_expose (GtkWidget      *widget,

-                    GdkEventExpose *event)
+                  GdkEventExpose *event)

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


@@ -701,6 +759,10 @@ 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)
+        return FALSE;
+

     if (event->window != pizza->bin_window)
         return FALSE;
 
     if (event->window != pizza->bin_window)
         return FALSE;
 


@@ -720,7 +782,7 @@ gtk_pizza_expose (GtkWidget      *widget,
         }
     }
 
         }
     }
 

-    return FALSE;
+    return TRUE;

 }
 
 static void
 }
 
 static void


@@ -736,7 +798,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;


@@ -767,7 +829,9 @@ 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);
             GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);

+#endif

 
             break;
         }
 
             break;
         }


@@ -778,9 +842,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;


@@ -808,7 +872,7 @@ gtk_pizza_forall (GtkContainer *container,
 
 static void
 gtk_pizza_position_child (GtkPizza      *pizza,
 
 static void
 gtk_pizza_position_child (GtkPizza      *pizza,

-                           GtkPizzaChild *child)
+                          GtkPizzaChild *child)

 {
     gint x;
     gint y;
 {
     gint x;
     gint y;


@@ -825,13 +889,17 @@ gtk_pizza_position_child (GtkPizza      *pizza,
                 gtk_widget_map (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);
         if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
             GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);

+#endif

     }
     else
     {
     }
     else
     {

+#ifndef __WXGTK20__

         if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
             GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
         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);
 
         if (GTK_WIDGET_MAPPED (child->widget))
             gtk_widget_unmap (child->widget);


@@ -840,7 +908,7 @@ gtk_pizza_position_child (GtkPizza      *pizza,
 
 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;


@@ -918,6 +986,8 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza,
 
 /* Callbacks */
 
 
 /* Callbacks */
 

+/* unused */
+#if 0

 /* Send a synthetic expose event to the widget
  */
 static void
 /* Send a synthetic expose event to the widget
  */
 static void


@@ -943,6 +1013,7 @@ gtk_pizza_expose_area (GtkPizza    *pizza,
         gdk_window_unref (event.window);
     }
 }
         gdk_window_unref (event.window);
     }
 }

+#endif /* unused */

 
 /* This function is used to find events to process while scrolling
  */
 
 /* This function is used to find events to process while scrolling
  */


@@ -952,12 +1023,12 @@ gtk_pizza_expose_predicate (Display *display,
                   XEvent  *xevent,
                   XPointer arg)
 {
                   XEvent  *xevent,
                   XPointer arg)
 {

-  if ((xevent->type == Expose) ||
-      ((xevent->xany.window == *(Window *)arg) &&
+    if ((xevent->type == Expose) ||
+       ((xevent->xany.window == *(Window *)arg) &&

        (xevent->type == ConfigureNotify)))
        (xevent->type == ConfigureNotify)))

-    return True;
-  else
-    return False;
+        return True;
+    else
+        return False;

 }
 
 /* This is the main routine to do the scrolling. Scrolling is
 }
 
 /* This is the main routine to do the scrolling. Scrolling is


@@ -975,40 +1046,40 @@ 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;
+    GtkWidget *widget;
+    XEvent xevent;

 
 

-  gint x,y,w,h,border;
+    gint x,y,w,h,border;

 
 

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

 
 

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

 
 

-  if (!GTK_WIDGET_MAPPED (pizza))
+    if (!GTK_WIDGET_MAPPED (pizza))

     {
     {

-      gtk_pizza_position_children (pizza);
-      return;
+        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;
+    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;
+    x = 0;
+    y = 0;
+    w = widget->allocation.width - 2*border;
+    h = widget->allocation.height - 2*border;

 
 

-  if (dx > 0)
+    if (dx > 0)

     {
     {

-      if (gravity_works)
+        if (gravity_works)

         {
           gdk_window_resize (pizza->bin_window,
                              w + dx,
         {
           gdk_window_resize (pizza->bin_window,
                              w + dx,


@@ -1016,20 +1087,14 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
           gdk_window_move   (pizza->bin_window, x-dx, y);
           gdk_window_move_resize (pizza->bin_window, x, y, w, h );
         }
           gdk_window_move   (pizza->bin_window, x-dx, y);
           gdk_window_move_resize (pizza->bin_window, x, y, w, h );
         }

-      else
+        else

         {
           /* FIXME */
         }
         {
           /* FIXME */
         }

-
-      gtk_pizza_expose_area (pizza,
-                              MAX ((gint)w - dx, 0),
-                              0,
-                              MIN (dx, w),
-                              h);

     }
     }

-  else if (dx < 0)
+    else if (dx < 0)

     {
     {

-      if (gravity_works)
+        if (gravity_works)

         {
           gdk_window_move_resize (pizza->bin_window,
                                   x + dx,
         {
           gdk_window_move_resize (pizza->bin_window,
                                   x + dx,


@@ -1039,102 +1104,73 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
           gdk_window_move   (pizza->bin_window, x, y);
           gdk_window_resize (pizza->bin_window, w, h );
         }
           gdk_window_move   (pizza->bin_window, x, y);
           gdk_window_resize (pizza->bin_window, w, h );
         }

-      else
+        else

         {
           /* FIXME */
         }
         {
           /* FIXME */
         }

-
-      gtk_pizza_expose_area (pizza,
-                              0,
-                              0,
-                              MIN (-dx, w),
-                              h);

     }
 
     }
 

-  if (dy > 0)
+    if (dy > 0)

     {
     {

-      if (gravity_works)
+        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 );
         }
         {
           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
+        else

         {
           /* FIXME */
         }
         {
           /* FIXME */
         }

-
-      gtk_pizza_expose_area (pizza,
-                              0,
-                              MAX ((gint)h - dy, 0),
-                              w,
-                              MIN (dy, h));

     }
     }

-  else if (dy < 0)
+    else if (dy < 0)

     {
     {

-      if (gravity_works)
+        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 );
         }
         {
           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
+        else

         {
           /* FIXME */
         }
         {
           /* 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)))
+    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;
+        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.xany.window == GDK_WINDOW_XWINDOW (pizza->bin_window)) )
+            gtk_pizza_filter (&xevent, &event, pizza);

 
 

-      if (xevent.type == Expose)
+        if (xevent.type == Expose)

         {
         {

-          event.expose.window = gdk_window_lookup (xevent.xany.window);
-          gdk_window_get_user_data (event.expose.window,
+            event.expose.window = gdk_window_lookup (xevent.xany.window);
+            gdk_window_get_user_data (event.expose.window,

                                     (gpointer *)&event_widget);
 
                                     (gpointer *)&event_widget);
 

-          if (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);
+                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);

             }
         }
     }
             }
         }
     }


@@ -1159,34 +1195,29 @@ gtk_pizza_filter (GdkXEvent *gdk_xevent,
     GtkPizza *pizza;
 
     xevent = (XEvent *)gdk_xevent;
     GtkPizza *pizza;
 
     xevent = (XEvent *)gdk_xevent;

-    
+

     pizza = GTK_PIZZA (data);
     pizza = GTK_PIZZA (data);

-    
-  switch (xevent->type)
+
+    if (!pizza->use_filter)
+        return GDK_FILTER_CONTINUE;
+
+    switch (xevent->type)

     {
     {

-    case Expose:
-      if (xevent->xexpose.serial == pizza->configure_serial)
-        {
-          if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED)
-            return GDK_FILTER_REMOVE;
-          else
+        case Expose:
+            if (xevent->xexpose.serial == pizza->configure_serial)

             {
             {

-              xevent->xexpose.x += pizza->scroll_x;
-              xevent->xexpose.y += pizza->scroll_y;
-
-              break;
+                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;
+        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;
     }
 
     return GDK_FILTER_CONTINUE;


@@ -1207,6 +1238,9 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
     xevent = (XEvent *)gdk_xevent;
     pizza = GTK_PIZZA (data);
 
     xevent = (XEvent *)gdk_xevent;
     pizza = GTK_PIZZA (data);
 

+    if (!pizza->use_filter)
+        return GDK_FILTER_CONTINUE;
+

     if (xevent->type == VisibilityNotify)
     {
         switch (xevent->xvisibility.state)
     if (xevent->type == VisibilityNotify)
     {
         switch (xevent->xvisibility.state)


@@ -1223,7 +1257,7 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
                 pizza->visibility = GDK_VISIBILITY_UNOBSCURED;
                 break;
         }
                 pizza->visibility = GDK_VISIBILITY_UNOBSCURED;
                 break;
         }

-        
+

         return GDK_FILTER_REMOVE;
     }
 
         return GDK_FILTER_REMOVE;
     }
 


@@ -1231,8 +1265,6 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
 }
 
 
 }
 
 

-
-

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