X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6fa52db667283fea7eaba7abe3dc48b8631f360..89e60357485b3da6e7ed7995fbcf8722d3df7ef4:/src/gtk/win_gtk.c

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 7d5f7a92ad..e2b14c9404 100644
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -9,11 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
-#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 "wx/gtk/win_gtk.h"
 #include "gtk/gtksignal.h"
 #include "gtk/gtkprivate.h"
 #include "gdk/gdkx.h"
@@ -191,6 +192,7 @@ gtk_pizza_init (GtkPizza *pizza)
 
     pizza->clear_on_draw = TRUE;
     pizza->use_filter = TRUE;
+    pizza->external_expose = FALSE;
 }
 
 GtkWidget*
@@ -250,6 +252,16 @@ gtk_pizza_set_filter (GtkPizza  *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
 gtk_pizza_put (GtkPizza   *pizza,
                GtkWidget  *widget,
@@ -413,6 +425,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)
 {
@@ -552,19 +591,19 @@ gtk_pizza_realize (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
@@ -652,16 +691,77 @@ static void
 gtk_pizza_draw (GtkWidget    *widget,
                 GdkRectangle *area)
 {
-    /* We handle all draws events in window.cpp now. */
-    return;
+    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)
 {
-    /* We handle all expose events in window.cpp now. */
-    return FALSE;
+    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 (event != NULL, FALSE);
+
+    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;
+
+    children = pizza->children;
+    while (children)
+    {
+        child = children->data;
+        children = children->next;
+
+        child_event = *event;
+
+        if (GTK_WIDGET_NO_WINDOW (child->widget) &&
+            GTK_WIDGET_DRAWABLE (child->widget) &&
+            gtk_widget_intersect (child->widget, &event->area, &child_event.area))
+        {
+            gtk_widget_event (child->widget, (GdkEvent*) &child_event);
+        }
+    }
+    
+    return TRUE;
 }
 
 static void