When making the DLL with glcanvas then you have to link the dll with

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

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index 58b2ec367bb93a50950b40e1d86b6ba58f5841b3..e2b14c94040df0a70139450b90ebfc69e8373118 100644 (file)
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -9,6 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
+#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"
@@ -26,7 +31,6 @@ extern "C" {
                           (y >= G_MINSHORT) && (y <= G_MAXSHORT))
 
 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;
-typedef struct _GtkPizzaChild    GtkPizzaChild;
 
 struct _GtkPizzaAdjData
 {
@@ -34,22 +38,13 @@ struct _GtkPizzaAdjData
     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);
@@ -63,42 +58,42 @@ static void gtk_pizza_add           (GtkContainer     *container,
                                      GtkWidget        *widget);
 static void gtk_pizza_remove        (GtkContainer     *container,
                                      GtkWidget        *widget);
-static void gtk_pizza_forall       (GtkContainer     *container,
-                                     gboolean              include_internals,
-                                     GtkCallback      callback,
-                                     gpointer         callback_data);
+static void gtk_pizza_forall        (GtkContainer     *container,
+                                     gboolean          include_internals,
+                                     GtkCallback       callback,
+                                     gpointer          callback_data);
 
 static void     gtk_pizza_position_child     (GtkPizza      *pizza,
-                                               GtkPizzaChild *child);
+                                              GtkPizzaChild *child);
 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,
-                                                       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,
-                                               GtkPizza      *pizza);
+                                              GtkPizza       *pizza);
 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,
-                                               GdkEvent       *event,
-                                               gpointer        data);
+                                              GdkEvent       *event,
+                                              gpointer        data);
 
 
 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);
 
@@ -186,6 +181,9 @@ gtk_pizza_init (GtkPizza *pizza)
     pizza->height = 20;
 
     pizza->bin_window = NULL;
+    
+    pizza->xoffset = 0;
+    pizza->yoffset = 0;
 
     pizza->configure_serial = 0;
     pizza->scroll_x = 0;
@@ -193,7 +191,8 @@ gtk_pizza_init (GtkPizza *pizza)
     pizza->visibility = GDK_VISIBILITY_PARTIAL;
 
     pizza->clear_on_draw = TRUE;
-    pizza->use_filter = FALSE;
+    pizza->use_filter = TRUE;
+    pizza->external_expose = FALSE;
 }
 
 GtkWidget*
@@ -215,7 +214,7 @@ gtk_pizza_scroll_set_adjustments (GtkPizza     *pizza,
 }
 
 void
-gtk_pizza_set_shadow_type (GtkPizza      *pizza,
+gtk_pizza_set_shadow_type (GtkPizza        *pizza,
                            GtkMyShadowType  type)
 {
     g_return_if_fail (pizza != NULL);
@@ -234,8 +233,8 @@ gtk_pizza_set_shadow_type (GtkPizza      *pizza,
 }
 
 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));
@@ -244,8 +243,8 @@ gtk_pizza_set_clear (GtkPizza     *pizza,
 }
 
 void       
-gtk_pizza_set_filter (GtkPizza          *pizza,
-                      gboolean           use)
+gtk_pizza_set_filter (GtkPizza  *pizza,
+                      gboolean   use)
 {
     g_return_if_fail (pizza != NULL);
     g_return_if_fail (GTK_IS_PIZZA (pizza));
@@ -253,13 +252,23 @@ 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,
-                 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;
 
@@ -304,10 +313,10 @@ gtk_pizza_put (GtkPizza    *pizza,
 }
 
 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;
@@ -338,10 +347,10 @@ gtk_pizza_move (GtkPizza    *pizza,
 }
 
 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;
@@ -374,12 +383,12 @@ gtk_pizza_resize (GtkPizza     *pizza,
 }
 
 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;
@@ -416,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)
 {
@@ -532,7 +568,7 @@ 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);
+    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);
@@ -555,24 +591,24 @@ 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
 gtk_pizza_size_request (GtkWidget      *widget,
-                          GtkRequisition *requisition)
+                        GtkRequisition *requisition)
 {
     GtkPizza *pizza;
     GtkPizzaChild *child;
@@ -605,7 +641,7 @@ gtk_pizza_size_request (GtkWidget      *widget,
 
 static void
 gtk_pizza_size_allocate (GtkWidget     *widget,
-                           GtkAllocation *allocation)
+                         GtkAllocation *allocation)
 {
     GtkPizza *pizza;
     gint border;
@@ -653,7 +689,7 @@ gtk_pizza_size_allocate (GtkWidget     *widget,
 
 static void
 gtk_pizza_draw (GtkWidget    *widget,
-                  GdkRectangle *area)
+                GdkRectangle *area)
 {
     GtkPizza *pizza;
     GtkPizzaChild *child;
@@ -665,6 +701,10 @@ gtk_pizza_draw (GtkWidget    *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))
@@ -685,7 +725,7 @@ gtk_pizza_draw (GtkWidget    *widget,
 
 static gint
 gtk_pizza_expose (GtkWidget      *widget,
-                    GdkEventExpose *event)
+                  GdkEventExpose *event)
 {
     GtkPizza *pizza;
     GtkPizzaChild *child;
@@ -698,6 +738,10 @@ gtk_pizza_expose (GtkWidget      *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;
 
@@ -716,8 +760,8 @@ gtk_pizza_expose (GtkWidget      *widget,
             gtk_widget_event (child->widget, (GdkEvent*) &child_event);
         }
     }
-
-    return FALSE;
+    
+    return TRUE;
 }
 
 static void
@@ -733,7 +777,7 @@ gtk_pizza_add (GtkContainer *container,
 
 static void
 gtk_pizza_remove (GtkContainer *container,
-                    GtkWidget    *widget)
+                  GtkWidget    *widget)
 {
     GtkPizza *pizza;
     GtkPizzaChild *child;
@@ -775,9 +819,9 @@ gtk_pizza_remove (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;
@@ -805,7 +849,7 @@ gtk_pizza_forall (GtkContainer *container,
 
 static void
 gtk_pizza_position_child (GtkPizza      *pizza,
-                           GtkPizzaChild *child)
+                          GtkPizzaChild *child)
 {
     gint x;
     gint y;
@@ -837,7 +881,7 @@ gtk_pizza_position_child (GtkPizza      *pizza,
 
 static void
 gtk_pizza_allocate_child (GtkPizza      *pizza,
-                           GtkPizzaChild *child)
+                          GtkPizzaChild *child)
 {
     GtkAllocation allocation;
     GtkRequisition requisition;
@@ -1159,6 +1203,9 @@ gtk_pizza_filter (GdkXEvent *gdk_xevent,
     
     pizza = GTK_PIZZA (data);
     
+    if (!pizza->use_filter)
+        return GDK_FILTER_CONTINUE;
+
   switch (xevent->type)
     {
     case Expose:
@@ -1203,6 +1250,9 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
 
     xevent = (XEvent *)gdk_xevent;
     pizza = GTK_PIZZA (data);
+    
+    if (!pizza->use_filter)
+        return GDK_FILTER_CONTINUE;
 
     if (xevent->type == VisibilityNotify)
     {