Improved selection mode handling in wxGrid::SelectBlock

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index b420b7764b57a1d9bbeaa01c459eb3969b534751..20d0181db6d4cdc22fc4e66afb2239c9c62c6abe 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -10,6 +10,10 @@
 /////////////////////////////////////////////////////////////////////////// */
 
 #include "wx/gtk/win_gtk.h"
 /////////////////////////////////////////////////////////////////////////// */
 
 #include "wx/gtk/win_gtk.h"

+#ifdef __VMS
+#define gtk_widget_get_child_requisition gtk_widget_get_child_requisitio
+#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINT
+#endif

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


@@ -18,11 +22,14 @@
 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;
 #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
                           (y >= G_MINSHORT) && (y <= G_MAXSHORT))
 
 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;

-typedef struct _GtkPizzaChild    GtkPizzaChild;

 
 struct _GtkPizzaAdjData
 {
 
 struct _GtkPizzaAdjData
 {


@@ -30,22 +37,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);


@@ -59,42 +57,42 @@ 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);
+                                                      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_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);

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


@@ -182,6 +180,9 @@ 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->configure_serial = 0;
     pizza->scroll_x = 0;
 
     pizza->configure_serial = 0;
     pizza->scroll_x = 0;


@@ -189,6 +190,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 = TRUE;
+    pizza->external_expose = FALSE;

 }
 
 GtkWidget*
 }
 
 GtkWidget*


@@ -210,8 +213,8 @@ gtk_pizza_scroll_set_adjustments (GtkPizza     *pizza,
 }
 
 void
 }
 
 void

-gtk_pizza_set_shadow_type (GtkPizza      *pizza,
-                             GtkMyShadowType  type)
+gtk_pizza_set_shadow_type (GtkPizza        *pizza,
+                           GtkMyShadowType  type)

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


@@ -229,8 +232,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));


@@ -238,13 +241,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)
+{
+    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;
 


@@ -270,11 +293,14 @@ gtk_pizza_put (GtkPizza    *pizza,
     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);
 

+/*

     if (GTK_WIDGET_REALIZED (pizza))
         gtk_widget_realize (widget);
     if (GTK_WIDGET_REALIZED (pizza))
         gtk_widget_realize (widget);

+*/

 
     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))
     if (GTK_WIDGET_VISIBLE (pizza) && GTK_WIDGET_VISIBLE (widget))
     {
         if (GTK_WIDGET_MAPPED (pizza))


@@ -282,13 +308,14 @@ gtk_pizza_put (GtkPizza    *pizza,
 
         gtk_widget_queue_resize (widget);
     }
 
         gtk_widget_queue_resize (widget);
     }

+*/

 }
 
 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;


@@ -319,10 +346,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;


@@ -355,12 +382,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;


@@ -483,7 +510,7 @@ gtk_pizza_realize (GtkWidget *widget)
        GDK_VISIBILITY_NOTIFY_MASK;
     attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
        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),
+    widget->window = gdk_window_new(gtk_widget_get_parent_window (widget),

                                      &attributes, attributes_mask);
     gdk_window_set_user_data (widget->window, widget);
 
                                      &attributes, attributes_mask);
     gdk_window_set_user_data (widget->window, widget);
 


@@ -507,13 +534,13 @@ gtk_pizza_realize (GtkWidget *widget)
        GDK_LEAVE_NOTIFY_MASK        |
        GDK_FOCUS_CHANGE_MASK;
 
        GDK_LEAVE_NOTIFY_MASK        |
        GDK_FOCUS_CHANGE_MASK;
 

-    pizza->bin_window = gdk_window_new (widget->window,
+    pizza->bin_window = gdk_window_new(widget->window,

                                           &attributes, attributes_mask);
     gdk_window_set_user_data (pizza->bin_window, widget);
 
     widget->style = gtk_style_attach (widget->style, widget->window);
     gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
                                           &attributes, attributes_mask);
     gdk_window_set_user_data (pizza->bin_window, 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);
+    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);
 
     /* add filters for intercepting visibility and expose events */
     gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza);


@@ -536,24 +563,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;


@@ -586,7 +613,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;


@@ -634,7 +661,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;


@@ -646,6 +673,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))


@@ -666,7 +697,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;


@@ -679,13 +710,9 @@ gtk_pizza_expose (GtkWidget      *widget,
 
     pizza = GTK_PIZZA (widget);
 
 
     pizza = GTK_PIZZA (widget);
 

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

         return FALSE;
         return FALSE;

-    }
-*/

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


@@ -705,8 +732,8 @@ gtk_pizza_expose (GtkWidget      *widget,
             gtk_widget_event (child->widget, (GdkEvent*) &child_event);
         }
     }
             gtk_widget_event (child->widget, (GdkEvent*) &child_event);
         }
     }

-
-    return FALSE;
+    
+    return TRUE;

 }
 
 static void
 }
 
 static void


@@ -722,7 +749,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,9 +791,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;


@@ -794,7 +821,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;


@@ -826,7 +853,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;


@@ -877,26 +904,28 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza,
                                gint       dx,
                                gint       dy)
 {
                                gint       dx,
                                gint       dy)
 {

-  GList *tmp_list;
-  GtkPizzaAdjData data;
+    GList *tmp_list;
+    GtkPizzaAdjData data;

 
 

-  data.dx = dx;
-  data.dy = dy;
+    data.dx = dx;
+    data.dy = dy;

 
 

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

     {
     {

-      GtkPizzaChild *child = tmp_list->data;
-      tmp_list = tmp_list->next;
+        GtkPizzaChild *child = tmp_list->data;
+        tmp_list = tmp_list->next;

 
 

-      child->widget->allocation.x += dx;
-      child->widget->allocation.y += dy;
+        child->widget->allocation.x += dx;
+        child->widget->allocation.y += dy;

 
 

-      if (GTK_WIDGET_NO_WINDOW (child->widget) &&
-          GTK_IS_CONTAINER (child->widget))
-        gtk_container_forall (GTK_CONTAINER (child->widget),
-                              gtk_pizza_adjust_allocations_recurse,
-                              &data);
+        if (GTK_WIDGET_NO_WINDOW (child->widget) &&
+            GTK_IS_CONTAINER (child->widget))
+        {
+            gtk_container_forall (GTK_CONTAINER (child->widget),
+                                  gtk_pizza_adjust_allocations_recurse,
+                                  &data);
+        }

     }
 }
 
     }
 }
 


@@ -908,23 +937,23 @@ static void
 gtk_pizza_expose_area (GtkPizza    *pizza,
                         gint x, gint y, gint width, gint height)
 {
 gtk_pizza_expose_area (GtkPizza    *pizza,
                         gint x, gint y, gint width, gint height)
 {

-  if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED)
+    if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED)

     {
     {

-      GdkEventExpose event;
+        GdkEventExpose event;

 
 

-      event.type = GDK_EXPOSE;
-      event.send_event = TRUE;
-      event.window = pizza->bin_window;
-      event.count = 0;
+        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;
+        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);
+        gdk_window_ref (event.window);
+        gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event);
+        gdk_window_unref (event.window);

     }
 }
 
     }
 }
 


@@ -1139,11 +1168,15 @@ gtk_pizza_filter (GdkXEvent *gdk_xevent,
                    GdkEvent  *event,
                    gpointer   data)
 {
                    GdkEvent  *event,
                    gpointer   data)
 {

-  XEvent *xevent;
-  GtkPizza *pizza;
+    XEvent *xevent;
+    GtkPizza *pizza;

 
 

-  xevent = (XEvent *)gdk_xevent;
-  pizza = GTK_PIZZA (data);
+    xevent = (XEvent *)gdk_xevent;
+    
+    pizza = GTK_PIZZA (data);
+    
+    if (!pizza->use_filter)
+        return GDK_FILTER_CONTINUE;

 
   switch (xevent->type)
     {
 
   switch (xevent->type)
     {


@@ -1172,7 +1205,7 @@ gtk_pizza_filter (GdkXEvent *gdk_xevent,
       break;
     }
 
       break;
     }
 

-  return GDK_FILTER_CONTINUE;
+    return GDK_FILTER_CONTINUE;

 }
 
 /* Although GDK does have a GDK_VISIBILITY_NOTIFY event,
 }
 
 /* Although GDK does have a GDK_VISIBILITY_NOTIFY event,


@@ -1184,34 +1217,36 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
                         GdkEvent  *event,
                         gpointer   data)
 {
                         GdkEvent  *event,
                         gpointer   data)
 {

-  XEvent *xevent;
-  GtkPizza *pizza;
+    XEvent *xevent;
+    GtkPizza *pizza;

 
 

-  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)
+    if (xevent->type == VisibilityNotify)

     {
     {

-      switch (xevent->xvisibility.state)
+        switch (xevent->xvisibility.state)

         {
         {

-        case VisibilityFullyObscured:
-          pizza->visibility = GDK_VISIBILITY_FULLY_OBSCURED;
-          break;
+            case VisibilityFullyObscured:
+                pizza->visibility = GDK_VISIBILITY_FULLY_OBSCURED;
+                break;

 
 

-        case VisibilityPartiallyObscured:
-          pizza->visibility = GDK_VISIBILITY_PARTIAL;
-          break;
+            case VisibilityPartiallyObscured:
+                pizza->visibility = GDK_VISIBILITY_PARTIAL;
+                break;

 
 

-        case VisibilityUnobscured:
-          pizza->visibility = GDK_VISIBILITY_UNOBSCURED;
-          break;
+            case VisibilityUnobscured:
+                pizza->visibility = GDK_VISIBILITY_UNOBSCURED;
+                break;

         }
         }

-
-      return GDK_FILTER_REMOVE;
+        
+        return GDK_FILTER_REMOVE;

     }
 
     }
 

-
-  return GDK_FILTER_CONTINUE;
+    return GDK_FILTER_CONTINUE;

 }
 
 
 }