wx/wxprec.h already includes wx/defs.h (with other minor cleaning).

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 2e1a9809f70ce145ba8f4e346735517d5fbc4f6e..85c77d7c025afbf24cb92515faadadea7a3de586 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,496 +1,898 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////

-// Name:        win_gtk.c
-// Purpose:     native GTK+ widget for wxWindows
+// Name:        src/gtk/win_gtk.c
+// 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
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////// */
 
 /////////////////////////////////////////////////////////////////////////// */
 

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

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

-#include <gtk/gtkfeatures.h>
+#include "gtk/gtksignal.h"
+#include "gtk/gtkprivate.h"
+#include "gdk/gdkx.h"

 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 

-static void gtk_myfixed_class_init    (GtkMyFixedClass    *klass);
-static void gtk_myfixed_init          (GtkMyFixed         *myfixed);
-static void gtk_myfixed_map           (GtkWidget        *widget);
-static void gtk_myfixed_unmap         (GtkWidget        *widget);
-static void gtk_myfixed_realize       (GtkWidget        *widget);
-static void gtk_myfixed_size_request  (GtkWidget        *widget,
-                                    GtkRequisition   *requisition);
-static void gtk_myfixed_size_allocate (GtkWidget        *widget,
-                                    GtkAllocation    *allocation);
-static void gtk_myfixed_paint         (GtkWidget        *widget,
-                                    GdkRectangle     *area);
-static void gtk_myfixed_draw          (GtkWidget        *widget,
-                                    GdkRectangle     *area);
-static gint gtk_myfixed_expose        (GtkWidget        *widget,
-                                    GdkEventExpose   *event);
-static void gtk_myfixed_add           (GtkContainer     *container,
-                                    GtkWidget        *widget);
-static void gtk_myfixed_remove        (GtkContainer     *container,
-                                    GtkWidget        *widget);
-static void gtk_myfixed_foreach       (GtkContainer     *container,
-#if (GTK_MINOR_VERSION == 1)
-                                    gboolean         include_internals,
-#endif
-                                    GtkCallback      callback,
-                                    gpointer         callback_data);
+typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;

 
 

+struct _GtkPizzaAdjData
+{
+    gint dx;
+    gint dy;
+};
+
+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_map           (GtkWidget        *widget);
+
+static void gtk_pizza_size_request  (GtkWidget        *widget,
+                                     GtkRequisition   *requisition);
+static void gtk_pizza_size_allocate (GtkWidget        *widget,
+                                     GtkAllocation    *allocation);
+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,
+                                     GtkWidget        *widget);
+static void gtk_pizza_forall        (GtkContainer     *container,
+                                     gboolean          include_internals,
+                                     GtkCallback       callback,
+                                     gpointer          callback_data);
+
+static void     gtk_pizza_allocate_child     (GtkPizza      *pizza,
+                                              GtkPizzaChild *child);
+static void     gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
+                                                      gpointer   cb_data);
+
+static GtkType gtk_pizza_child_type (GtkContainer     *container);
+
+static void  gtk_pizza_scroll_set_adjustments (GtkPizza      *pizza,
+                                               GtkAdjustment *hadj,
+                                               GtkAdjustment *vadj);
+
+/* static */
+GtkContainerClass *pizza_parent_class = NULL;
+
+GtkType
+gtk_pizza_get_type ()
+{
+    static GtkType pizza_type = 0;

 
 

-static GtkContainerClass *parent_class = NULL;
+    if (!pizza_type)
+    {
+        static const GTypeInfo pizza_info =
+        {
+            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 = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, (GTypeFlags)0);
+    }

 
 

+    return pizza_type;
+}

 
 

-guint
-gtk_myfixed_get_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)

 {
 {

-  static guint myfixed_type = 0;
+  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 (!myfixed_type)
+  if (G_CCLOSURE_SWAP_DATA (closure))

     {
     {

-      GtkTypeInfo myfixed_info =
-      {
-       "GtkMyFixed",
-       sizeof (GtkMyFixed),
-       sizeof (GtkMyFixedClass),
-       (GtkClassInitFunc) gtk_myfixed_class_init,
-       (GtkObjectInitFunc) gtk_myfixed_init,
-       (GtkArgSetFunc) NULL,
-        (GtkArgGetFunc) NULL,
-      };
-
-      myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);
+      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);

 
 

-  return myfixed_type;
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);

 }
 
 static void
 }
 
 static void

-gtk_myfixed_class_init (GtkMyFixedClass *klass)
+gtk_pizza_class_init (GtkPizzaClass *klass)

 {
 {

-  GtkObjectClass *object_class;
-  GtkWidgetClass *widget_class;
-  GtkContainerClass *container_class;
-
-  object_class = (GtkObjectClass*) klass;
-  widget_class = (GtkWidgetClass*) klass;
-  container_class = (GtkContainerClass*) klass;
-
-  parent_class = gtk_type_class (gtk_container_get_type ());
-
-  widget_class->map = gtk_myfixed_map;
-  widget_class->unmap = gtk_myfixed_unmap;
-  widget_class->realize = gtk_myfixed_realize;
-  widget_class->size_request = gtk_myfixed_size_request;
-  widget_class->size_allocate = gtk_myfixed_size_allocate;
-  widget_class->draw = gtk_myfixed_draw;
-  widget_class->expose_event = gtk_myfixed_expose;
-
-  container_class->add = gtk_myfixed_add;
-  container_class->remove = gtk_myfixed_remove;
-#if (GTK_MINOR_VERSION == 1)
-  container_class->forall = gtk_myfixed_foreach;
-#else
-  container_class->foreach = gtk_myfixed_foreach;
-#endif
+    GtkObjectClass *object_class;
+    GtkWidgetClass *widget_class;
+    GtkContainerClass *container_class;
+
+    object_class = (GtkObjectClass*) klass;
+    widget_class = (GtkWidgetClass*) klass;
+    container_class = (GtkContainerClass*) klass;
+    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->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->forall = gtk_pizza_forall;
+
+    container_class->child_type = gtk_pizza_child_type;
+
+    klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments;
+
+    widget_class->set_scroll_adjustments_signal =
+        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
+gtk_pizza_child_type (GtkContainer     *container)
+{
+    return GTK_TYPE_WIDGET;

 }
 
 static void
 }
 
 static void

-gtk_myfixed_init (GtkMyFixed *myfixed)
+gtk_pizza_init (GtkPizza *pizza)

 {
 {

-  GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW);
-  GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC);
-  
-  myfixed->children = NULL;
+    GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW);
+
+    pizza->shadow_type = GTK_MYSHADOW_NONE;
+
+    pizza->children = NULL;
+
+    pizza->width = 20;
+    pizza->height = 20;
+
+    pizza->bin_window = NULL;
+
+    pizza->xoffset = 0;
+    pizza->yoffset = 0;
+
+    pizza->configure_serial = 0;
+    pizza->scroll_x = 0;
+    pizza->scroll_y = 0;
+    pizza->visibility = GDK_VISIBILITY_PARTIAL;
+
+    pizza->clear_on_draw = TRUE;
+    pizza->use_filter = TRUE;
+    pizza->external_expose = FALSE;

 }
 
 GtkWidget*
 }
 
 GtkWidget*

-gtk_myfixed_new ()
+gtk_pizza_new ()

 {
 {

-  GtkMyFixed *myfixed;
+    GtkPizza *pizza;

 
 

-  myfixed = gtk_type_new (gtk_myfixed_get_type ());
-  
-  return GTK_WIDGET (myfixed);
+    pizza = gtk_type_new (gtk_pizza_get_type ());
+
+    return GTK_WIDGET (pizza);
+}
+
+static void
+gtk_pizza_scroll_set_adjustments (GtkPizza     *pizza,
+                                    GtkAdjustment  *hadj,
+                                    GtkAdjustment  *vadj)
+{
+   /* We handle scrolling in the wxScrolledWindow, not here. */

 }
 
 void
 }
 
 void

-gtk_myfixed_put (GtkMyFixed       *myfixed,
-               GtkWidget      *widget,
-               gint16         x,
-               gint16         y)
+gtk_pizza_set_shadow_type (GtkPizza        *pizza,
+                           GtkMyShadowType  type)

 {
 {

-  GtkMyFixedChild *child_info;
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));

 
 

-  g_return_if_fail (myfixed != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (myfixed));
-  g_return_if_fail (widget != NULL);
+    if ((GtkMyShadowType) pizza->shadow_type != type)
+    {
+        pizza->shadow_type = type;

 
 

-  child_info = g_new (GtkMyFixedChild, 1);
-  child_info->widget = widget;
-  child_info->x = x;
-  child_info->y = y;
-  
-  gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
+        if (GTK_WIDGET_VISIBLE (pizza))
+        {
+            gtk_widget_size_allocate (GTK_WIDGET (pizza), &(GTK_WIDGET (pizza)->allocation));
+            gtk_widget_queue_draw (GTK_WIDGET (pizza));
+        }
+    }
+}

 
 

-  myfixed->children = g_list_append (myfixed->children, child_info); 
+void
+gtk_pizza_set_clear (GtkPizza  *pizza,
+                     gboolean   clear)
+{
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));

 
 

-  if (GTK_WIDGET_REALIZED (myfixed) && !GTK_WIDGET_REALIZED (widget))
-    gtk_widget_realize (widget);
+    pizza->clear_on_draw = clear;
+}

 
 

-  if (GTK_WIDGET_MAPPED (myfixed) && !GTK_WIDGET_MAPPED (widget))
-    gtk_widget_map (widget);
+void
+gtk_pizza_set_filter (GtkPizza  *pizza,
+                      gboolean   use)
+{
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));

 
 

-  if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
-    gtk_widget_queue_resize (GTK_WIDGET (myfixed));
+    pizza->use_filter = use;

 }
 
 void
 }
 
 void

-gtk_myfixed_move (GtkMyFixed       *myfixed,
-                GtkWidget      *widget,
-                gint16         x,
-                gint16         y)
+gtk_pizza_set_external (GtkPizza  *pizza,
+                        gboolean   expose)

 {
 {

-  GtkMyFixedChild *child;
-  GList *children;
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));

 
 

-  g_return_if_fail (myfixed != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (myfixed));
-  g_return_if_fail (widget != NULL);
+    pizza->external_expose = expose;
+}

 
 

-  children = myfixed->children;
-  while (children)
+void
+gtk_pizza_put (GtkPizza   *pizza,
+               GtkWidget  *widget,
+               gint        x,
+               gint        y,
+               gint        width,
+               gint        height)
+{
+    GtkPizzaChild *child_info;
+
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));
+    g_return_if_fail (widget != NULL);
+
+    child_info = g_new (GtkPizzaChild, 1);
+
+    child_info->widget = widget;
+    child_info->x = x;
+    child_info->y = y;
+    child_info->width = width;
+    child_info->height = height;
+
+    pizza->children = g_list_append (pizza->children, child_info);
+
+    if (GTK_WIDGET_REALIZED (pizza))
+      gtk_widget_set_parent_window (widget, pizza->bin_window);
+
+    gtk_widget_set_parent (widget, GTK_WIDGET (pizza));
+
+    gtk_widget_set_size_request (widget, width, height);
+}
+
+void
+gtk_pizza_move (GtkPizza     *pizza,
+                  GtkWidget  *widget,
+                  gint        x,
+                  gint        y)
+{
+    GtkPizzaChild *child;
+    GList *children;
+
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));
+    g_return_if_fail (widget != NULL);
+
+    children = pizza->children;
+    while (children)

     {
     {

-      child = children->data;
-      children = children->next;
+        child = children->data;
+        children = children->next;

 
 

-      if (child->widget == widget)
+        if (child->widget == widget)

         {
         {

-         if ((child->x == x) && (child->y == y)) return;
-         
-          child->x = x;
-          child->y = y;
+            if ((child->x == x) && (child->y == y))
+                break;

 
 

-          if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
-            gtk_widget_queue_resize (GTK_WIDGET (myfixed));
+            child->x = x;
+            child->y = y;

 
 

-          break;
+            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
+                gtk_widget_queue_resize (widget);
+            break;

         }
     }
 }
 
         }
     }
 }
 

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

 {
 {

-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GList *children;
+    GtkPizzaChild *child;
+    GList *children;
+
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));
+    g_return_if_fail (widget != NULL);

 
 

-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (widget));
+    children = pizza->children;
+    while (children)
+    {
+        child = children->data;
+        children = children->next;

 
 

-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-  myfixed = GTK_MYFIXED (widget);
+        if (child->widget == widget)
+        {
+            if ((child->width == width) && (child->height == height))
+                break;

 
 

-  gdk_window_show (widget->window);
+            child->width = width;
+            child->height = height;

 
 

-  children = myfixed->children;
-  while (children)
-    {
-      child = children->data;
-      children = children->next;
+            gtk_widget_set_size_request (widget, width, height);

 
 

-      if (GTK_WIDGET_VISIBLE (child->widget) &&
-         !GTK_WIDGET_MAPPED (child->widget))
-       gtk_widget_map (child->widget);
+            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
+                gtk_widget_queue_resize (widget);
+            break;
+        }

     }
 }
 
     }
 }
 

-static void
-gtk_myfixed_unmap (GtkWidget *widget)
+void
+gtk_pizza_set_size (GtkPizza   *pizza,
+                    GtkWidget  *widget,
+                    gint        x,
+                    gint        y,
+                    gint        width,
+                    gint        height)

 {
 {

-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (widget));
+    GtkPizzaChild *child;
+    GList *children;
+
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));
+    g_return_if_fail (widget != NULL);
+
+#ifndef WX_WARN_ILLEGAL_SETSIZE
+    /* this really shouldn't happen -- but it does, a lot, right now and we
+       can't pass negative values to gtk_widget_set_size_request() without getting
+       a warning printed out, so filter them out here */
+    if ( width < 0 )
+        width = 0;
+    if ( height < 0 )
+        height = 0;
+#endif
+
+    children = pizza->children;
+    while (children)
+    {
+        child = children->data;
+        children = children->next;
+
+        if (child->widget == widget)
+        {
+            if ((child->x == x) &&
+                (child->y == y) &&
+                (child->width == width) &&
+                (child->height == height)) return;
+
+            child->x = x;
+            child->y = y;
+            child->width = width;
+            child->height = height;
+
+            gtk_widget_set_size_request (widget, width, height);

 
 

-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
+                gtk_widget_queue_resize (widget);
+
+            return;
+        }
+    }

 }
 
 }
 

-static void
-gtk_myfixed_realize (GtkWidget *widget)
+gint
+gtk_pizza_child_resized  (GtkPizza   *pizza,
+                          GtkWidget  *widget)

 {
 {

-  GtkMyFixed *myfixed;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (widget));
-
-  myfixed = GTK_MYFIXED (widget);
-  
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = widget->allocation.x;
-  attributes.y = widget->allocation.y;
-  attributes.width = 32000;
-  attributes.height = 32000;
-  attributes.wclass = GDK_INPUT_OUTPUT;
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.event_mask = gtk_widget_get_events (widget);
-  attributes.event_mask |= 
-  GDK_EXPOSURE_MASK    |
-  GDK_POINTER_MOTION_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_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, 
-                                  attributes_mask);
-  gdk_window_set_user_data (widget->window, widget);
-    
-  widget->style = gtk_style_attach (widget->style, widget->window);
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+    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
 }
 
 static void

-gtk_myfixed_size_request (GtkWidget      *widget,
-                       GtkRequisition *requisition)
+gtk_pizza_map (GtkWidget *widget)

 {
 {

-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GList *children;
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (widget));
-  g_return_if_fail (requisition != NULL);
-
-  myfixed = GTK_MYFIXED (widget);
-  
-  requisition->width = 0;
-  requisition->height = 0;
-
-  children = myfixed->children;
-  while (children)
+    GtkPizza *pizza;
+    GtkPizzaChild *child;
+    GList *children;
+
+    g_return_if_fail (widget != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (widget));
+
+    GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+    pizza = GTK_PIZZA (widget);
+
+    children = pizza->children;
+    while (children)

     {
     {

-      child = children->data;
-      children = children->next;
+        child = children->data;
+        children = children->next;

 
 

-      if (GTK_WIDGET_VISIBLE (child->widget))
-       {
-          gtk_widget_size_request (child->widget, &child->widget->requisition);
-       }
+        if ( GTK_WIDGET_VISIBLE (child->widget) &&
+            !GTK_WIDGET_MAPPED (child->widget) &&
+            TRUE)
+        {
+            gtk_widget_map (child->widget);
+        }

     }
     }

+
+    gdk_window_show (widget->window);
+    gdk_window_show (pizza->bin_window);

 }
 
 static void
 }
 
 static void

-gtk_myfixed_size_allocate (GtkWidget     *widget,
-                        GtkAllocation *allocation)
+gtk_pizza_realize (GtkWidget *widget)

 {
 {

-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GtkAllocation child_allocation;
-  GList *children;
-  guint16 border_width;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED(widget));
-  g_return_if_fail (allocation != NULL);
-
-  myfixed = GTK_MYFIXED (widget);
-
-  widget->allocation = *allocation;
-  if (GTK_WIDGET_REALIZED (widget))
-    gdk_window_move_resize (widget->window, allocation->x, allocation->y, 32000, 32000 );
-
-  border_width = GTK_CONTAINER (myfixed)->border_width;
-  
-  children = myfixed->children;
-  while (children)
+    GtkPizza *pizza;
+    GdkWindowAttr attributes;
+    gint attributes_mask;
+    GtkPizzaChild *child;
+    GList *children;
+
+    g_return_if_fail (widget != NULL);
+    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;
+
+    attributes.x = widget->allocation.x;
+    attributes.y = widget->allocation.y;
+    attributes.width = widget->allocation.width;
+    attributes.height = widget->allocation.height;
+
+#ifndef __WXUNIVERSAL__
+    if (pizza->shadow_type == GTK_MYSHADOW_NONE)

     {
     {

-      child = children->data;
-      children = children->next;
-      
-      if (GTK_WIDGET_VISIBLE (child->widget))
-       {
-         child_allocation.x = child->x + border_width;
-         child_allocation.y = child->y + border_width;
-         child_allocation.width = child->widget->requisition.width;
-         child_allocation.height = child->widget->requisition.height;
-         gtk_widget_size_allocate (child->widget, &child_allocation);
-       }
+        /* no border, no changes to sizes */
+    }
+    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;
+    }
+    else
+    {
+        /* GTK_MYSHADOW_IN == wxSUNKEN_BORDER */
+        /* GTK_MYSHADOW_OUT == wxRAISED_BORDER */
+        attributes.x += 2;
+        attributes.y += 2;
+        attributes.width -= 4;
+        attributes.height -= 4;
+    }
+#endif /* __WXUNIVERSAL__ */
+
+    /* minimal size */
+    if (attributes.width < 2) attributes.width = 2;
+    if (attributes.height < 2) attributes.height = 2;
+
+    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_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, attributes_mask);
+    gdk_window_set_user_data (widget->window, widget);
+
+    attributes.x = 0;
+    attributes.y = 0;
+
+    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_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);
+    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 );
+
+/*
+    gdk_window_set_back_pixmap( widget->window, NULL, FALSE );
+    gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
+*/
+
+    /* cannot be done before realisation */
+    children = pizza->children;
+    while (children)
+    {
+        child = children->data;
+        children = children->next;
+
+        gtk_widget_set_parent_window (child->widget, pizza->bin_window);

     }
 }
 
 static void
     }
 }
 
 static void

-gtk_myfixed_paint (GtkWidget    *widget,
-                GdkRectangle *area)
+gtk_pizza_unrealize (GtkWidget *widget)

 {
 {

-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (widget));
-  g_return_if_fail (area != NULL);
-
-  if (GTK_WIDGET_DRAWABLE (widget))
-      gdk_window_clear_area (widget->window,
-                            area->x, area->y,
-                            area->width, area->height);
+    GtkPizza *pizza;
+
+    g_return_if_fail (widget != NULL);
+    g_return_if_fail (GTK_IS_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;
+
+    if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize)
+       (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget);

 }
 
 static void
 }
 
 static void

-gtk_myfixed_draw (GtkWidget    *widget,
-               GdkRectangle *area)
+gtk_pizza_size_request (GtkWidget      *widget,
+                        GtkRequisition *requisition)

 {
 {

-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GdkRectangle child_area;
-  GList *children;
+    GtkPizza *pizza;
+    GtkPizzaChild *child;
+    GList *children;
+    GtkRequisition child_requisition;
+
+    g_return_if_fail (widget != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (widget));
+    g_return_if_fail (requisition != NULL);
+
+    pizza = GTK_PIZZA (widget);
+
+    children = pizza->children;
+    while (children)
+    {
+        child = children->data;
+        children = children->next;
+
+        if (GTK_WIDGET_VISIBLE (child->widget))
+        {
+            gtk_widget_size_request (child->widget, &child_requisition);
+        }
+    }
+
+    /* request very little, I'm not sure if requesting nothing
+       will always have positive effects on stability... */
+    requisition->width = 2;
+    requisition->height = 2;
+}

 
 

-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (widget));
+static void
+gtk_pizza_size_allocate (GtkWidget     *widget,
+                         GtkAllocation *allocation)
+{
+    GtkPizza *pizza;
+    gint border;
+    gint x,y,w,h;
+    GtkPizzaChild *child;
+    GList *children;
+
+    g_return_if_fail (widget != NULL);
+    g_return_if_fail (GTK_IS_PIZZA(widget));
+    g_return_if_fail (allocation != NULL);
+
+    pizza = GTK_PIZZA (widget);
+
+    widget->allocation = *allocation;
+
+    if (pizza->shadow_type == GTK_MYSHADOW_NONE)
+        border = 0;
+    else
+    if (pizza->shadow_type == GTK_MYSHADOW_THIN)
+        border = 1;
+    else
+        border = 2;
+
+    x = allocation->x + border;
+    y = allocation->y + border;
+    w = allocation->width - border*2;
+    h = allocation->height - border*2;
+
+    if (GTK_WIDGET_REALIZED (widget))
+    {
+        gdk_window_move_resize( widget->window, x, y, w, h );
+        gdk_window_move_resize( pizza->bin_window, 0, 0, w, h );
+    }

 
 

-  if (GTK_WIDGET_DRAWABLE (widget))
+    children = pizza->children;
+    while (children)

     {
     {

-      myfixed = GTK_MYFIXED (widget);
-      gtk_myfixed_paint (widget, area);
-
-      children = myfixed->children;
-      while (children)
-       {
-         child = children->data;
-         children = children->next;
-
-         if (gtk_widget_intersect (child->widget, area, &child_area))
-           gtk_widget_draw (child->widget, &child_area);
-       }
+        child = children->data;
+        children = children->next;
+
+        gtk_pizza_allocate_child (pizza, child);

     }
 }
 
 static gint
     }
 }
 
 static gint

-gtk_myfixed_expose (GtkWidget      *widget,
-                 GdkEventExpose *event)
+gtk_pizza_expose (GtkWidget      *widget,
+                  GdkEventExpose *event)

 {
 {

-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GdkEventExpose child_event;
-  GList *children;
+    GtkPizza *pizza;

 
 

-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_MYFIXED (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+    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);

 
 

-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      myfixed = GTK_MYFIXED (widget);
+    pizza = GTK_PIZZA (widget);
+
+    if (event->window != pizza->bin_window)
+        return FALSE;

 
 

-      child_event = *event;
+    /* We handle all expose events in window.cpp now. */
+    if (pizza->external_expose)
+        return FALSE;

 
 

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

 
 

-         if (GTK_WIDGET_NO_WINDOW (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 FALSE;
+    (* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style);

 }
 
 static void
 }
 
 static void

-gtk_myfixed_add (GtkContainer *container,
-              GtkWidget    *widget)
+gtk_pizza_add (GtkContainer *container,
+               GtkWidget    *widget)

 {
 {

-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (container));
-  g_return_if_fail (widget != NULL);
+    g_return_if_fail (container != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (container));
+    g_return_if_fail (widget != NULL);

 
 

-  gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0);
+    gtk_pizza_put (GTK_PIZZA (container), widget, 0, 0, 20, 20 );

 }
 
 static void
 }
 
 static void

-gtk_myfixed_remove (GtkContainer *container,
-                 GtkWidget    *widget)
+gtk_pizza_remove (GtkContainer *container,
+                  GtkWidget    *widget)

 {
 {

-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GList *children;
+    GtkPizza *pizza;
+    GtkPizzaChild *child;
+    GList *children;

 
 

-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (container));
-  g_return_if_fail (widget != NULL);
+    g_return_if_fail (container != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (container));
+    g_return_if_fail (widget != NULL);

 
 

-  myfixed = GTK_MYFIXED (container);
+    pizza = GTK_PIZZA (container);

 
 

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

     {
     {

-      child = children->data;
+        child = children->data;

 
 

-      if (child->widget == widget)
-       {
-         gtk_widget_unparent (widget);
+        if (child->widget == widget)
+        {
+            gtk_widget_unparent (widget);
+
+            /* security checks */
+            g_return_if_fail (GTK_IS_WIDGET (widget));

 
 

-         myfixed->children = g_list_remove_link (myfixed->children, children);
-         g_list_free (children);
-         g_free (child);
+            pizza->children = g_list_remove_link (pizza->children, children);
+            g_list_free (children);
+            g_free (child);

 
 

-         if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (container))
-           gtk_widget_queue_resize (GTK_WIDGET (container));
+            /* security checks */
+            g_return_if_fail (GTK_IS_WIDGET (widget));

 
 

-         break;
-       }
+            break;
+        }

 
 

-      children = children->next;
+        children = children->next;

     }
 }
 
 static void
     }
 }
 
 static void

-gtk_myfixed_foreach (GtkContainer *container,
-#if (GTK_MINOR_VERSION == 1)
-                  gboolean      include_internals,
-#endif
-                  GtkCallback   callback,
-                  gpointer      callback_data)
+gtk_pizza_forall (GtkContainer *container,
+                  gboolean      include_internals,
+                  GtkCallback   callback,
+                  gpointer      callback_data)

 {
 {

-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GList *children;
+    GtkPizza *pizza;
+    GtkPizzaChild *child;
+    GList *children;

 
 

-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (container));
-  g_return_if_fail (callback != NULL);
+    g_return_if_fail (container != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (container));
+    g_return_if_fail (callback != (GtkCallback)NULL);

 
 

-  myfixed = GTK_MYFIXED (container);
+    pizza = GTK_PIZZA (container);

 
 

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

     {
     {

-      child = children->data;
-      children = children->next;
+        child = children->data;
+        children = children->next;

 
 

-      (* callback) (child->widget, callback_data);
+        (* callback) (child->widget, callback_data);

     }
 }
 
     }
 }
 

+static void
+gtk_pizza_allocate_child (GtkPizza      *pizza,
+                          GtkPizzaChild *child)
+{
+    GtkAllocation allocation;
+    GtkRequisition requisition;
+
+    allocation.x = child->x - pizza->xoffset;
+    allocation.y = child->y - pizza->yoffset;
+    gtk_widget_get_child_requisition (child->widget, &requisition);
+    allocation.width = requisition.width;
+    allocation.height = requisition.height;
+
+    gtk_widget_size_allocate (child->widget, &allocation);
+}
+
+static void
+gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
+                                       gpointer   cb_data)
+{
+    GtkPizzaAdjData *data = cb_data;
+
+    widget->allocation.x += data->dx;
+    widget->allocation.y += data->dy;
+
+    if (GTK_WIDGET_NO_WINDOW (widget) && GTK_IS_CONTAINER (widget))
+    {
+        gtk_container_forall (GTK_CONTAINER (widget),
+                          gtk_pizza_adjust_allocations_recurse,
+                          cb_data);
+    }
+}
+
+static void
+gtk_pizza_adjust_allocations (GtkPizza *pizza,
+                               gint       dx,
+                               gint       dy)
+{
+    GList *tmp_list;
+    GtkPizzaAdjData data;
+
+    data.dx = dx;
+    data.dy = dy;
+
+    tmp_list = pizza->children;
+    while (tmp_list)
+    {
+        GtkPizzaChild *child = tmp_list->data;
+        tmp_list = tmp_list->next;
+
+        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);
+        }
+    }
+}
+
+
+/* This is the main routine to do the scrolling. Scrolling is
+ * done by "Guffaw" scrolling, as in the Mozilla XFE, with
+ * a few modifications.
+ *
+ * The main improvement is that we keep track of whether we
+ * are obscured or not. If not, we ignore the generated expose
+ * events and instead do the exposes ourself, without having
+ * to wait for a roundtrip to the server. This also provides
+ * a limited form of expose-event compression, since we do
+ * the affected area as one big chunk.
+ */
+
+void
+gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
+{
+    pizza->xoffset += dx;
+    pizza->yoffset += dy;
+
+    gtk_pizza_adjust_allocations (pizza, -dx, -dy);
+
+    if (pizza->bin_window)
+        gdk_window_scroll( pizza->bin_window, -dx, -dy );
+}

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

-