]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/win_gtk.c
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
On Mac the first visible line needs to be recalculated after the Scroll because it...
[wxWidgets.git] / src / gtk / win_gtk.c
diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 529c295cd3165e3d3839c1913abcf4314285febe..4f396aafd1d6222b224a95ba33f3c4ec9846eb58 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,92 +1,152 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////
-// 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/gtksignal.h"
-#include "gtk/gtknotebook.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);
-#if (GTK_MINOR_VERSION == 0)
-static void gtk_myfixed_unmap         (GtkWidget        *widget);
-#endif
-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 > 0)
-                                    gboolean         include_internals,
-#endif
-                                    GtkCallback      callback,
-                                    gpointer         callback_data);
-#if (GTK_MINOR_VERSION > 0)
-static GtkType gtk_myfixed_child_type (GtkContainer     *container);
-#endif
-
-#if (GTK_MINOR_VERSION > 0)
-static void  gtk_myfixed_scroll_set_adjustments    (GtkMyFixed   *myfixed,
-                                              GtkAdjustment *hadj,
-                                              GtkAdjustment *vadj);
-#endif
+typedef struct _GtkPizzaChild GtkPizzaChild;
+typedef struct _GtkPizzaClass GtkPizzaClass;
+typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;
 
 
+struct _GtkPizzaClass
+{
+  GtkContainerClass parent_class;
 
 
+  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
+                                     GtkAdjustment  *hadjustment,
+                                     GtkAdjustment  *vadjustment);
+};
 
 
-static GtkContainerClass *parent_class = NULL;
+struct _GtkPizzaChild
+{
+    GtkWidget *widget;
+    gint x;
+    gint y;
+};
 
 
-guint
-gtk_myfixed_get_type ()
+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 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 GtkType gtk_pizza_child_type (GtkContainer     *container);
+
+static void  gtk_pizza_scroll_set_adjustments (GtkPizza      *pizza,
+                                               GtkAdjustment *hadj,
+                                               GtkAdjustment *vadj);
+
+static GtkWidgetClass* pizza_parent_class;
+
+GtkType
+gtk_pizza_get_type ()
 {
 {
-    static guint myfixed_type = 0;
+    static GtkType pizza_type = 0;
 
 
-    if (!myfixed_type)
+    if (!pizza_type)
     {
     {
-        GtkTypeInfo myfixed_info =
+        const GTypeInfo pizza_info =
         {
         {
-          "GtkMyFixed",
-          sizeof (GtkMyFixed),
-          sizeof (GtkMyFixedClass),
-          (GtkClassInitFunc) gtk_myfixed_class_init,
-          (GtkObjectInitFunc) gtk_myfixed_init,
-#if (GTK_MINOR_VERSION > 0)
-          /* reserved_1 */ NULL,
-           /* reserved_2 */ NULL,
-           (GtkClassInitFunc) NULL,
-#else
-           (GtkArgSetFunc) NULL,
-           (GtkArgGetFunc) NULL,
-#endif
+            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,
+            NULL
         };
         };
-        myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);
+        pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, (GTypeFlags)0);
     }
     }
-    
-    return myfixed_type;
+
+    return pizza_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
 static void
-gtk_myfixed_class_init (GtkMyFixedClass *klass)
+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)
+{
+  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 (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      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);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);
+}
+
+static void
+gtk_pizza_class_init (GtkPizzaClass *klass)
 {
     GtkObjectClass *object_class;
     GtkWidgetClass *widget_class;
 {
     GtkObjectClass *object_class;
     GtkWidgetClass *widget_class;
@@ -95,219 +155,197 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass)
     object_class = (GtkObjectClass*) klass;
     widget_class = (GtkWidgetClass*) klass;
     container_class = (GtkContainerClass*) klass;
     object_class = (GtkObjectClass*) klass;
     widget_class = (GtkWidgetClass*) klass;
     container_class = (GtkContainerClass*) klass;
-  
-#if (GTK_MINOR_VERSION > 0)
-    parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
-#else
-    parent_class = gtk_type_class (gtk_container_get_type ());
-#endif
+    pizza_parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
 
 
-    widget_class->map = gtk_myfixed_map;
-#if (GTK_MINOR_VERSION == 0)
-    widget_class->unmap = gtk_myfixed_unmap;
-#endif
-    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 > 0)
-    container_class->forall = gtk_myfixed_foreach;
-#else
-    container_class->foreach = gtk_myfixed_foreach;
-#endif
+    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->style_set = gtk_pizza_style_set;
 
 
-#if (GTK_MINOR_VERSION > 0)
-    container_class->child_type = gtk_myfixed_child_type;
-#endif
+    container_class->add = gtk_pizza_add;
+    container_class->remove = gtk_pizza_remove;
+    container_class->forall = gtk_pizza_forall;
 
 
-#if (GTK_MINOR_VERSION > 0)
-    klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments;
+    container_class->child_type = gtk_pizza_child_type;
+
+    klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments;
 
     widget_class->set_scroll_adjustments_signal =
 
     widget_class->set_scroll_adjustments_signal =
-    gtk_signal_new ("set_scroll_adjustments",
-                   GTK_RUN_LAST,
-                   object_class->type,
-                   GTK_SIGNAL_OFFSET (GtkMyFixedClass, set_scroll_adjustments),
-                   gtk_marshal_NONE__POINTER_POINTER,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-#endif
+        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);
 }
 
 }
 
-#if (GTK_MINOR_VERSION > 0)
 static GtkType
 static GtkType
-gtk_myfixed_child_type (GtkContainer     *container)
+gtk_pizza_child_type (GtkContainer     *container)
 {
     return GTK_TYPE_WIDGET;
 }
 {
     return GTK_TYPE_WIDGET;
 }
-#endif
 
 static void
 
 static void
-gtk_myfixed_init (GtkMyFixed *myfixed)
+gtk_pizza_init (GtkPizza *pizza)
 {
 {
-    GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW);
-  
-#if (GTK_MINOR_VERSION == 0)
-    GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC);
-#endif
+    GTK_WIDGET_SET_FLAGS (pizza, GTK_CAN_FOCUS);
+    GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW);
 
 
-#if (GTK_MINOR_VERSION > 0)
-    myfixed->shadow_type = GTK_SHADOW_NONE;
-#endif
+    pizza->children = NULL;
 
 
-    myfixed->children = NULL;
+    pizza->bin_window = NULL;
+
+    pizza->m_xoffset = 0;
+    pizza->m_yoffset = 0;
 }
 
 GtkWidget*
 }
 
 GtkWidget*
-gtk_myfixed_new ()
+gtk_pizza_new ()
 {
 {
-    GtkMyFixed *myfixed;
+    GtkPizza *pizza;
+
+    pizza = g_object_new (gtk_pizza_get_type (), NULL);
+    
+    pizza->m_noscroll = FALSE;
 
 
-    myfixed = gtk_type_new (gtk_myfixed_get_type ());
-  
-    return GTK_WIDGET (myfixed);
+    return GTK_WIDGET (pizza);
 }
 
 }
 
-#if (GTK_MINOR_VERSION > 0)
-void  
-gtk_myfixed_scroll_set_adjustments (GtkMyFixed     *myfixed,
-                                   GtkAdjustment  *hadj,
-                                   GtkAdjustment  *vadj)
+GtkWidget*
+gtk_pizza_new_no_scroll ()
 {
 {
-   /* OK, this is embarassing, but this function has to be here */
+    GtkPizza *pizza;
+
+    pizza = g_object_new (gtk_pizza_get_type (), NULL);
+
+    pizza->m_noscroll = TRUE;
+
+    return GTK_WIDGET (pizza);
 }
 
 }
 
-void 
-gtk_myfixed_set_shadow_type (GtkMyFixed    *myfixed,
-                            GtkShadowType  type)
+gint       gtk_pizza_get_xoffset     (GtkPizza          *pizza)
 {
 {
-    g_return_if_fail (myfixed != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (myfixed));
-
-    if ((GtkShadowType) myfixed->shadow_type != type)
-    {
-        myfixed->shadow_type = type;
+    g_return_val_if_fail ( (pizza != NULL), -1 );
+    g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 );
 
 
-        if (GTK_WIDGET_VISIBLE (myfixed))
-       {
-           gtk_widget_size_allocate (GTK_WIDGET (myfixed), &(GTK_WIDGET (myfixed)->allocation));
-           gtk_widget_queue_draw (GTK_WIDGET (myfixed));
-       }
-    }
+    return pizza->m_xoffset;
 }
 }
-#endif
 
 
-void
-gtk_myfixed_put (GtkMyFixed    *myfixed,
-                 GtkWidget     *widget,
-                 gint16         x,
-                 gint16         y,
-                gint16         width,
-                gint16         height)
+gint       gtk_pizza_get_yoffset     (GtkPizza          *pizza)
 {
 {
-    GtkMyFixedChild *child_info;
+    g_return_val_if_fail ( (pizza != NULL), -1 );
+    g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 );
 
 
-    g_return_if_fail (myfixed != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (myfixed));
-    g_return_if_fail (widget != NULL);
+    return pizza->m_yoffset;
+}
 
 
-    child_info = g_new (GtkMyFixedChild, 1);
-    child_info->widget = widget;
-    child_info->x = x;
-    child_info->y = y;
-    child_info->width = width;
-    child_info->height = height;
-  
-    gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
+void       gtk_pizza_set_xoffset     (GtkPizza          *pizza, gint xoffset)
+{
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));
 
 
-    myfixed->children = g_list_append (myfixed->children, child_info); 
+    pizza->m_xoffset = xoffset;
+    // do something
+}
 
 
-    if (GTK_WIDGET_REALIZED (myfixed))
-        gtk_widget_realize (widget);
+void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset)
+{
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));
 
 
-    if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget))
-    {
-        if (GTK_WIDGET_MAPPED (myfixed))
-           gtk_widget_map (widget);
-      
-        gtk_widget_queue_resize (GTK_WIDGET (myfixed));
-    }
+    pizza->m_xoffset = yoffset;
+    // do something
 }
 
 }
 
-void
-gtk_myfixed_move (GtkMyFixed    *myfixed,
-                  GtkWidget     *widget,
-                  gint16         x,
-                  gint16         y)
+gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza)
 {
 {
-    GtkMyFixedChild *child;
-    GList *children;
+    gint border;
 
 
-    g_return_if_fail (myfixed != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (myfixed));
-    g_return_if_fail (widget != NULL);
+    g_return_val_if_fail ( (pizza != NULL), 0 );
+    g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), 0 );
 
 
-    children = myfixed->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
-      
-        if (child->widget == widget)
-        {
-            gtk_myfixed_set_size( myfixed, widget, x, y, child->width, child->height );
-           break;
-       }
-    }
+    if (!pizza->bin_window) return 0;
+
+    border = pizza->container.border_width;
+
+    return GTK_WIDGET(pizza)->allocation.width - border*2;
+}
+
+
+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_resize (GtkMyFixed     *myfixed,
-                    GtkWidget      *widget,
-                   gint16         width,
-                   gint16         height)
+gtk_pizza_put (GtkPizza   *pizza,
+               GtkWidget  *widget,
+               gint        x,
+               gint        y,
+               gint        width,
+               gint        height)
 {
 {
-    GtkMyFixedChild *child;
-    GList *children;
+    GtkPizzaChild *child_info;
 
 
-    g_return_if_fail (myfixed != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (myfixed));
+    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);
 
-    children = myfixed->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
-      
-        if (child->widget == widget)
-        {
-             gtk_myfixed_set_size( myfixed, widget, child->x, child->y, width, height );
-            break;
-       }
-    }
+    child_info = g_new (GtkPizzaChild, 1);
+
+    child_info->widget = widget;
+    child_info->x = x;
+    child_info->y = y;
+
+    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 );
+    if (GTK_WIDGET_REALIZED (pizza))
+        gtk_pizza_allocate_child (pizza, child_info);
 }
 
 void
 }
 
 void
-gtk_myfixed_set_size (GtkMyFixed    *myfixed,
-                      GtkWidget     *widget,
-                      gint16         x,
-                      gint16         y,
-                     gint16         width,
-                     gint16         height)
+gtk_pizza_set_size (GtkPizza   *pizza,
+                    GtkWidget  *widget,
+                    gint        x,
+                    gint        y,
+                    gint        width,
+                    gint        height)
 {
 {
-    GtkMyFixedChild *child;
+    GtkPizzaChild *child;
     GList *children;
     GList *children;
-    GtkAllocation child_allocation;
 
 
-    g_return_if_fail (myfixed != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (myfixed));
+    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);
 
-    children = myfixed->children;
+#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;
     while (children)
     {
         child = children->data;
@@ -315,177 +353,198 @@ gtk_myfixed_set_size (GtkMyFixed    *myfixed,
 
         if (child->widget == widget)
         {
 
         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;
-
-            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
-           {
-                if ( (child->width > 1) && 
-                    (child->height > 1) && 
-                   !(GTK_WIDGET_REALIZED(widget) && GTK_IS_NOTEBOOK(widget)) )
-               {
-                    child_allocation.x = child->x;
-                    child_allocation.y = child->y;
-                    child_allocation.width = MAX( child->width, 1 );
-                    child_allocation.height = MAX( child->height, 1 );
-               
-                   /* work around for GTK bug when moving widgets outside
-                      the X window -> do NOT move them entirely outside */
-                   if (child_allocation.y + child_allocation.height < 0)
-                       child_allocation.y = -child_allocation.height;
-                   if (child_allocation.x + child_allocation.width < 0)
-                       child_allocation.x = -child_allocation.width;
-               
-                    gtk_widget_size_allocate (widget, &child_allocation);
-                } 
-               else 
-               {
-                    gtk_widget_queue_resize (GTK_WIDGET (myfixed));
-               } 
-           }
-            break;
+            if (child->x != x || child->y != y)
+            {
+                child->x = x;
+                child->y = y;
+                gtk_widget_queue_resize(widget);
+            }
+
+            gtk_widget_set_size_request (widget, width, height);
+
+            return;
         }
     }
 }
 
 static void
         }
     }
 }
 
 static void
-gtk_myfixed_map (GtkWidget *widget)
+gtk_pizza_map (GtkWidget *widget)
 {
 {
-    GtkMyFixed *myfixed;
-    GtkMyFixedChild *child;
+    GtkPizza *pizza;
+    GtkPizzaChild *child;
     GList *children;
 
     g_return_if_fail (widget != NULL);
     GList *children;
 
     g_return_if_fail (widget != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (widget));
+    g_return_if_fail (GTK_IS_PIZZA (widget));
 
     GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
 
     GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-    myfixed = GTK_MYFIXED (widget);
+    pizza = GTK_PIZZA (widget);
 
 
-    children = myfixed->children;
+    children = pizza->children;
     while (children)
     {
         child = children->data;
         children = children->next;
 
     while (children)
     {
         child = children->data;
         children = children->next;
 
-        if (GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget))
-           gtk_widget_map (child->widget);
+        if ( GTK_WIDGET_VISIBLE (child->widget) &&
+            !GTK_WIDGET_MAPPED (child->widget) )
+        {
+            gtk_widget_map (child->widget);
+        }
     }
     }
-    
-    gdk_window_show (widget->window);
-}
-
-#if (GTK_MINOR_VERSION == 0)
-static void
-gtk_myfixed_unmap (GtkWidget *widget)
-{
-    g_return_if_fail (widget != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (widget));
 
 
-    GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+    gdk_window_show (widget->window);
+    gdk_window_show (pizza->bin_window);
 }
 }
-#endif
 
 static void
 
 static void
-gtk_myfixed_realize (GtkWidget *widget)
+gtk_pizza_realize (GtkWidget *widget)
 {
 {
-    GtkMyFixed *myfixed;
+    GtkPizza *pizza;
     GdkWindowAttr attributes;
     gint attributes_mask;
     GdkWindowAttr attributes;
     gint attributes_mask;
+    GtkPizzaChild *child;
+    GList *children;
+    int border;
+    int w, h;
 
     g_return_if_fail (widget != NULL);
 
     g_return_if_fail (widget != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (widget));
+    g_return_if_fail (GTK_IS_PIZZA (widget));
 
 
-    myfixed = GTK_MYFIXED (widget);
-  
+    pizza = GTK_PIZZA (widget);
     GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
     attributes.window_type = GDK_WINDOW_CHILD;
     GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
     attributes.window_type = GDK_WINDOW_CHILD;
-  
-#if (GTK_MINOR_VERSION > 0)
+
     attributes.x = widget->allocation.x;
     attributes.y = widget->allocation.y;
     attributes.width = widget->allocation.width;
     attributes.height = widget->allocation.height;
 
     attributes.x = widget->allocation.x;
     attributes.y = widget->allocation.y;
     attributes.width = widget->allocation.width;
     attributes.height = widget->allocation.height;
 
-    if (myfixed->shadow_type != GTK_SHADOW_NONE)
-    {
-        attributes.x += 2;
-        attributes.y += 2;
-        attributes.width -= 4;
-        attributes.height -= 4;
-    }
-    
+    /* minimal size */
     if (attributes.width < 2) attributes.width = 2;
     if (attributes.height < 2) attributes.height = 2;
     if (attributes.width < 2) attributes.width = 2;
     if (attributes.height < 2) attributes.height = 2;
-#else
-    attributes.x = widget->allocation.x;
-    attributes.y = widget->allocation.y;
-    attributes.width = 32000;
-    attributes.height = 32000;
-#endif
+
+    border = pizza->container.border_width;
+    w = attributes.width  - 2 * border;
+    h = attributes.height - 2 * border;
+    if (w < 2) w = 2;
+    if (h < 2) h = 2;
+
+    if (!pizza->m_noscroll)
+    {
+        attributes.x += border;
+        attributes.y += border;
+        attributes.width  = w;
+        attributes.height = h;
+    }
+
     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 = 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_VISIBILITY_NOTIFY_MASK;
     attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
     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);
+    widget->window = gdk_window_new(gtk_widget_get_parent_window (widget),
+                                     &attributes, attributes_mask);
     gdk_window_set_user_data (widget->window, widget);
     gdk_window_set_user_data (widget->window, widget);
-    
+
+    attributes.x = 0;
+    attributes.y = 0;
+    if (pizza->m_noscroll)
+    {
+        attributes.x = border;
+        attributes.y = border;
+        attributes.width  = w;
+        attributes.height = h;
+    }
+
+    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);
     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
+gtk_pizza_unrealize (GtkWidget *widget)
+{
+    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 (pizza_parent_class->unrealize)
+        pizza_parent_class->unrealize(widget);
 }
 
 static void
 }
 
 static void
-gtk_myfixed_size_request (GtkWidget      *widget,
-                         GtkRequisition *requisition)
+gtk_pizza_size_request (GtkWidget      *widget,
+                        GtkRequisition *requisition)
 {
 {
-    GtkMyFixed *myfixed;
-    GtkMyFixedChild *child;
+    GtkPizza *pizza;
+    GtkPizzaChild *child;
     GList *children;
     GtkRequisition child_requisition;
     GList *children;
     GtkRequisition child_requisition;
-  
+
     g_return_if_fail (widget != NULL);
     g_return_if_fail (widget != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (widget));
+    g_return_if_fail (GTK_IS_PIZZA (widget));
     g_return_if_fail (requisition != NULL);
 
     g_return_if_fail (requisition != NULL);
 
-    myfixed = GTK_MYFIXED (widget);
-  
-    children = myfixed->children;
+    pizza = GTK_PIZZA (widget);
+
+    children = pizza->children;
     while (children)
     {
         child = children->data;
         children = children->next;
 
         if (GTK_WIDGET_VISIBLE (child->widget))
     while (children)
     {
         child = children->data;
         children = children->next;
 
         if (GTK_WIDGET_VISIBLE (child->widget))
-       {
+        {
             gtk_widget_size_request (child->widget, &child_requisition);
             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;
     /* request very little, I'm not sure if requesting nothing
        will always have positive effects on stability... */
     requisition->width = 2;
@@ -493,235 +552,211 @@ gtk_myfixed_size_request (GtkWidget      *widget,
 }
 
 static void
 }
 
 static void
-gtk_myfixed_size_allocate (GtkWidget     *widget,
-                          GtkAllocation *allocation)
+gtk_pizza_size_allocate (GtkWidget     *widget,
+                         GtkAllocation *allocation)
 {
 {
-    GtkMyFixed *myfixed;
+    GtkPizza *pizza;
     gint border;
     gint border;
-    GtkMyFixedChild *child;
-    GtkAllocation child_allocation; 
-    GList *children; 
+    gint x,y,w,h;
+    GtkPizzaChild *child;
+    GList *children;
+    gboolean only_resize;
 
     g_return_if_fail (widget != NULL);
 
     g_return_if_fail (widget != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED(widget));
+    g_return_if_fail (GTK_IS_PIZZA(widget));
     g_return_if_fail (allocation != NULL);
 
     g_return_if_fail (allocation != NULL);
 
-    myfixed = GTK_MYFIXED (widget);
-  
+    pizza = GTK_PIZZA (widget);
+
+    only_resize = ((widget->allocation.x == allocation->x) &&
+                   (widget->allocation.y == allocation->y));
     widget->allocation = *allocation;
     widget->allocation = *allocation;
-#if (GTK_MINOR_VERSION > 0)
-    if (myfixed->shadow_type == GTK_SHADOW_NONE)
-        border = 0;
-    else
-        border = 2;
-#else
-    border = 0;
-#endif
 
 
-    if (GTK_WIDGET_REALIZED (widget))
+    if (GTK_WIDGET_REALIZED(widget))
     {
     {
-        gdk_window_move_resize( widget->window, 
-                                allocation->x+border, allocation->y+border, 
-#if (GTK_MINOR_VERSION > 0)
-                               allocation->width-border*2, allocation->height-border*2
-#else
-                               32000, 32000
-#endif
-                              );
+        border = pizza->container.border_width;
+
+        x = allocation->x + border;
+        y = allocation->y + border;
+        w = allocation->width - border*2;
+        h = allocation->height - border*2;
+        if (w < 0)
+            w = 0;
+        if (h < 0)
+            h = 0;
+
+        if (pizza->m_noscroll)
+        {
+            if (only_resize)
+                gdk_window_resize( widget->window, allocation->width, allocation->height );
+            else
+                gdk_window_move_resize( widget->window, allocation->x, allocation->y, 
+                                                        allocation->width, allocation->height );
+
+            gdk_window_move_resize( pizza->bin_window, border, border, w, h );
+        }
+        else
+        {
+            if (only_resize)
+                gdk_window_resize( widget->window, w, h );
+            else
+                gdk_window_move_resize( widget->window, x, y, w, h );
+
+            gdk_window_resize( pizza->bin_window, w, h );
+        }
     }
 
     }
 
-    children = myfixed->children;
+    children = pizza->children;
     while (children)
     {
         child = children->data;
         children = children->next;
     while (children)
     {
         child = children->data;
         children = children->next;
- 
-        /* please look at the text in wxWindow::DoSetSize() on why the
-           test GTK_WIDGET_REALIZED() has to be here */
-        if (GTK_WIDGET_VISIBLE (child->widget))
-        { 
-/*          if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget))
-            {
-               gtk_widget_queue_resize( child->widget );
-           }
-           else */
-           {
-               child_allocation.x = child->x;
-               child_allocation.y = child->y;
-                child_allocation.width = MAX( child->width, 1 );
-                child_allocation.height = MAX( child->height, 1 );
-               
-               /* work around for GTK bug when moving widgets outside
-                  the X window -> do NOT move them entirely outside */
-               if (child_allocation.y + child_allocation.height < 0)
-                   child_allocation.y = -child_allocation.height;
-               if (child_allocation.x + child_allocation.width < 0)
-                   child_allocation.x = -child_allocation.width;
-         
-               gtk_widget_size_allocate (child->widget, &child_allocation);
-           }
-        }
+
+        gtk_pizza_allocate_child (pizza, child);
     }
 }
 
 static void
     }
 }
 
 static void
-gtk_myfixed_paint (GtkWidget    *widget,
-                  GdkRectangle *area)
+gtk_pizza_style_set(GtkWidget *widget, GtkStyle  *previous_style)
 {
 {
-    g_return_if_fail (widget != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (widget));
-    g_return_if_fail (area != NULL);
+    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 );
+    }
 
 
-    if (GTK_WIDGET_DRAWABLE (widget))
-        gdk_window_clear_area (widget->window,
-                              area->x, area->y,
-                              area->width, area->height);
+    pizza_parent_class->style_set(widget, previous_style);
 }
 
 static void
 }
 
 static void
-gtk_myfixed_draw (GtkWidget    *widget,
-                 GdkRectangle *area)
+gtk_pizza_add (GtkContainer *container,
+               GtkWidget    *widget)
 {
 {
-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GdkRectangle child_area;
-  GList *children;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (widget));
+    g_return_if_fail (container != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (container));
+    g_return_if_fail (widget != NULL);
 
 
-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      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);
-       }
-    }
+    gtk_pizza_put (GTK_PIZZA (container), widget, 0, 0, 20, 20 );
 }
 
 }
 
-static gint
-gtk_myfixed_expose (GtkWidget      *widget,
-                   GdkEventExpose *event)
+static void
+gtk_pizza_remove (GtkContainer *container,
+                  GtkWidget    *widget)
 {
 {
-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GdkEventExpose child_event;
-  GList *children;
+    GtkPizza *pizza;
+    GtkPizzaChild *child;
+    GList *children;
 
 
-  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_if_fail (container != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (container));
+    g_return_if_fail (widget != NULL);
+
+    pizza = GTK_PIZZA (container);
 
 
-  if (GTK_WIDGET_DRAWABLE (widget))
+    children = pizza->children;
+    while (children)
     {
     {
-      myfixed = GTK_MYFIXED (widget);
+        child = children->data;
 
 
-      child_event = *event;
+        if (child->widget == widget)
+        {
+            gtk_widget_unparent (widget);
 
 
-      children = myfixed->children;
-      while (children)
-       {
-         child = children->data;
-         children = children->next;
+            /* security checks */
+            g_return_if_fail (GTK_IS_WIDGET (widget));
 
 
-         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);
-       }
-    }
+            pizza->children = g_list_remove_link (pizza->children, children);
+            g_list_free (children);
+            g_free (child);
 
 
-  return FALSE;
-}
+            /* security checks */
+            g_return_if_fail (GTK_IS_WIDGET (widget));
 
 
-static void
-gtk_myfixed_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);
+            break;
+        }
 
 
-  gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0, 20, 20 );
+        children = children->next;
+    }
 }
 
 static void
 }
 
 static void
-gtk_myfixed_remove (GtkContainer *container,
-                 GtkWidget    *widget)
+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 (widget != 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;
-
-      if (child->widget == widget)
-       {
-         gboolean was_visible = GTK_WIDGET_VISIBLE (widget);
-         
-         gtk_widget_unparent (widget);
-
-         myfixed->children = g_list_remove_link (myfixed->children, children);
-         g_list_free (children);
-         g_free (child);
-
-         if (was_visible && GTK_WIDGET_VISIBLE (container))
-           gtk_widget_queue_resize (GTK_WIDGET (container));
-
-         break;
-       }
+        child = children->data;
+        children = children->next;
 
 
-      children = children->next;
+        (* callback) (child->widget, callback_data);
     }
 }
 
 static void
     }
 }
 
 static void
-gtk_myfixed_foreach (GtkContainer *container,
-#if (GTK_MINOR_VERSION > 0)
-                  gboolean      include_internals,
-#endif
-                  GtkCallback   callback,
-                  gpointer      callback_data)
+gtk_pizza_allocate_child (GtkPizza      *pizza,
+                          GtkPizzaChild *child)
 {
 {
-  GtkMyFixed *myfixed;
-  GtkMyFixedChild *child;
-  GList *children;
-
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (container));
-  g_return_if_fail (callback != NULL);
+    GtkAllocation allocation;
+    GtkRequisition requisition;
 
 
-  myfixed = GTK_MYFIXED (container);
+    allocation.x = child->x - pizza->m_xoffset;
+    allocation.y = child->y - pizza->m_yoffset;
+    gtk_widget_get_child_requisition (child->widget, &requisition);
+    allocation.width = requisition.width;
+    allocation.height = requisition.height;
 
 
-  children = myfixed->children;
-  while (children)
+    if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL)
     {
     {
-      child = children->data;
-      children = children->next;
+        /* reverse horizontal placement */
+        gint offset,border;
+
+        offset = GTK_WIDGET(pizza)->allocation.width;
+        border = pizza->container.border_width;
+        offset -= border*2;
 
 
-      (* callback) (child->widget, callback_data);
+        allocation.x = offset - child->x - allocation.width + pizza->m_xoffset;
     }
     }
+
+    gtk_widget_size_allocate (child->widget, &allocation);
 }
 
 }
 
+void
+gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
+{
+    GList *tmp_list;
+    
+    pizza->m_xoffset += dx;
+    pizza->m_yoffset += dy;
+
+    if (pizza->bin_window)
+        gdk_window_scroll( pizza->bin_window, -dx, -dy );
+        
+    tmp_list = pizza->children;
+    while (tmp_list)
+    {
+        GtkPizzaChild *child = tmp_list->data;
+        tmp_list = tmp_list->next;
+
+        GtkAllocation alloc = child->widget->allocation;
+        alloc.x -= dx;
+        alloc.y -= dy;
+        gtk_widget_size_allocate( child->widget, &alloc );
+    }
+}
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
wxWidgets (Impactor)