]> 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
Toolbars shouldn't have themed borders
[wxWidgets.git] / src / gtk / win_gtk.c
diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 1c9d78426647ce9a53b028d64fcaf9314a9bfbf9..d0955231ceaaf3488c524cc2a0efe02d513f8cbf 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,133 +1,154 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////
-// Name:        win_gtk.c
-// Purpose:     Native GTK+ widget for wxWindows, based on GtkLayout and
+// 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
 //              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
-// 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/gtkprivate.h"
-#include "gdk/gdkx.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
-                          (y >= G_MINSHORT) && (y <= G_MAXSHORT))
-
-typedef struct _GtkMyFixedAdjData  GtkMyFixedAdjData;
-typedef struct _GtkMyFixedChild    GtkMyFixedChild;
+typedef struct _GtkPizzaChild GtkPizzaChild;
+typedef struct _GtkPizzaClass GtkPizzaClass;
+typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;
 
 
-struct _GtkMyFixedAdjData 
+struct _GtkPizzaClass
 {
 {
-    gint dx;
-    gint dy;
+  GtkContainerClass parent_class;
+
+  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
+                                     GtkAdjustment  *hadjustment,
+                                     GtkAdjustment  *vadjustment);
 };
 
 };
 
-struct _GtkMyFixedChild
+struct _GtkPizzaChild
 {
     GtkWidget *widget;
     gint x;
     gint y;
 {
     GtkWidget *widget;
     gint x;
     gint y;
-    gint width;
-    gint height;
 };
 
 };
 
-static void gtk_myfixed_class_init      (GtkMyFixedClass  *klass);
-static void gtk_myfixed_init            (GtkMyFixed       *myfixed);
-
-static void gtk_myfixed_realize         (GtkWidget        *widget);
-static void gtk_myfixed_unrealize       (GtkWidget        *widget);
-
-static void gtk_myfixed_map             (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_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_forall       (GtkContainer     *container,
-                                    gboolean         include_internals,
-                                    GtkCallback      callback,
-                                    gpointer         callback_data);
-
-static void     gtk_myfixed_position_child     (GtkMyFixed      *myfixed,
-                                              GtkMyFixedChild *child);
-static void     gtk_myfixed_allocate_child     (GtkMyFixed      *myfixed,
-                                              GtkMyFixedChild *child);
-static void     gtk_myfixed_position_children  (GtkMyFixed      *myfixed);
-
-static void     gtk_myfixed_adjust_allocations_recurse (GtkWidget *widget,
-                                                      gpointer   cb_data);
-static void     gtk_myfixed_adjust_allocations         (GtkMyFixed *myfixed,
-                                                      gint       dx,
-                                                      gint       dy);
-
-
-static void     gtk_myfixed_expose_area        (GtkMyFixed      *myfixed,
-                                              gint            x, 
-                                              gint            y, 
-                                              gint            width, 
-                                              gint            height);
-static void     gtk_myfixed_adjustment_changed (GtkAdjustment  *adjustment,
-                                              GtkMyFixed      *myfixed);
-static GdkFilterReturn gtk_myfixed_filter      (GdkXEvent      *gdk_xevent,
-                                              GdkEvent       *event,
-                                              gpointer        data);
-static GdkFilterReturn gtk_myfixed_main_filter (GdkXEvent      *gdk_xevent,
-                                              GdkEvent       *event,
-                                              gpointer        data);
-
-
-static GtkType gtk_myfixed_child_type (GtkContainer     *container);
-
-static void  gtk_myfixed_scroll_set_adjustments    (GtkMyFixed   *myfixed,
-                                              GtkAdjustment *hadj,
-                                              GtkAdjustment *vadj);
-
-
-static GtkContainerClass *parent_class = NULL;
-static gboolean gravity_works;
-
-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 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 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,
-          /* reserved_1 */ NULL,
-           /* reserved_2 */ NULL,
-           (GtkClassInitFunc) NULL,
+            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
+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
 }
 
 static void
-gtk_myfixed_class_init (GtkMyFixedClass *klass)
+gtk_pizza_class_init (GtkPizzaClass *klass)
 {
     GtkObjectClass *object_class;
     GtkWidgetClass *widget_class;
 {
     GtkObjectClass *object_class;
     GtkWidgetClass *widget_class;
@@ -136,241 +157,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;
-    parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
+    pizza_parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
 
 
-    widget_class->map = gtk_myfixed_map;
-    widget_class->realize = gtk_myfixed_realize;
-    widget_class->unrealize = gtk_myfixed_unrealize;
-    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;
+    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;
 
 
-    container_class->add = gtk_myfixed_add;
-    container_class->remove = gtk_myfixed_remove;
-    container_class->forall = gtk_myfixed_forall;
+    container_class->add = gtk_pizza_add;
+    container_class->remove = gtk_pizza_remove;
+    container_class->forall = gtk_pizza_forall;
 
 
-    container_class->child_type = gtk_myfixed_child_type;
+    container_class->child_type = gtk_pizza_child_type;
 
 
-    klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments;
+    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);
+        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
 }
 
 static GtkType
-gtk_myfixed_child_type (GtkContainer     *container)
+gtk_pizza_child_type (GtkContainer     *container)
 {
     return GTK_TYPE_WIDGET;
 }
 
 static void
 {
     return GTK_TYPE_WIDGET;
 }
 
 static void
-gtk_myfixed_init (GtkMyFixed *myfixed)
+gtk_pizza_init (GtkPizza *pizza)
 {
 {
-    GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW);
-  
-    myfixed->shadow_type = GTK_MYSHADOW_NONE;
+    GTK_WIDGET_SET_FLAGS (pizza, GTK_CAN_FOCUS);
+    GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW);
 
 
-    myfixed->children = NULL;
-    
-    myfixed->width = 20;
-    myfixed->height = 20;
+    pizza->children = NULL;
+
+    pizza->bin_window = NULL;
+
+    pizza->m_xoffset = 0;
+    pizza->m_yoffset = 0;
+}
 
 
-    myfixed->bin_window = NULL;
+GtkWidget*
+gtk_pizza_new ()
+{
+    GtkPizza *pizza;
 
 
-    myfixed->configure_serial = 0;
-    myfixed->scroll_x = 0;
-    myfixed->scroll_y = 0;
-    myfixed->visibility = GDK_VISIBILITY_PARTIAL;
+    pizza = g_object_new (gtk_pizza_get_type (), NULL);
     
     
-    myfixed->clear_on_draw = TRUE;
+    pizza->m_noscroll = FALSE;
+
+    return GTK_WIDGET (pizza);
 }
 
 GtkWidget*
 }
 
 GtkWidget*
-gtk_myfixed_new ()
+gtk_pizza_new_no_scroll ()
 {
 {
-    GtkMyFixed *myfixed;
+    GtkPizza *pizza;
+
+    pizza = g_object_new (gtk_pizza_get_type (), NULL);
 
 
-    myfixed = gtk_type_new (gtk_myfixed_get_type ());
-  
-    return GTK_WIDGET (myfixed);
+    pizza->m_noscroll = TRUE;
+
+    return GTK_WIDGET (pizza);
 }
 
 }
 
-void  
-gtk_myfixed_scroll_set_adjustments (GtkMyFixed     *myfixed,
-                                   GtkAdjustment  *hadj,
-                                   GtkAdjustment  *vadj)
+gint       gtk_pizza_get_xoffset     (GtkPizza          *pizza)
 {
 {
-   /* We handle scrolling in the wxScrolledWindow, not here. */
+    g_return_val_if_fail ( (pizza != NULL), -1 );
+    g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 );
+
+    return pizza->m_xoffset;
 }
 
 }
 
-void 
-gtk_myfixed_set_shadow_type (GtkMyFixed      *myfixed,
-                            GtkMyShadowType  type)
+gint       gtk_pizza_get_yoffset     (GtkPizza          *pizza)
 {
 {
-    g_return_if_fail (myfixed != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (myfixed));
+    g_return_val_if_fail ( (pizza != NULL), -1 );
+    g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 );
 
 
-    if ((GtkMyShadowType) myfixed->shadow_type != type)
-    {
-        myfixed->shadow_type = type;
+    return pizza->m_yoffset;
+}
 
 
-        if (GTK_WIDGET_VISIBLE (myfixed))
-       {
-           gtk_widget_size_allocate (GTK_WIDGET (myfixed), &(GTK_WIDGET (myfixed)->allocation));
-           gtk_widget_queue_draw (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));
+
+    pizza->m_xoffset = xoffset;
+    // do something
 }
 
 }
 
-void       
-gtk_my_fixed_set_clear (GtkMyFixed     *myfixed,
-                        gboolean        clear)
+void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset)
 {
 {
-    g_return_if_fail (myfixed != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (myfixed));
-    
-    myfixed->clear_on_draw = clear;
-}      
-                                       
-void
-gtk_myfixed_put (GtkMyFixed    *myfixed,
-                 GtkWidget     *widget,
-                 gint         x,
-                 gint         y,
-                gint         width,
-                gint         height)
+    g_return_if_fail (pizza != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (pizza));
+
+    pizza->m_xoffset = yoffset;
+    // do something
+}
+
+gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza)
 {
 {
-    GtkMyFixedChild *child_info;
+    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 );
 
 
-    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;
-  
-    myfixed->children = g_list_append (myfixed->children, child_info); 
+    if (!pizza->bin_window) return 0;
 
 
-    gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
+    border = pizza->container.border_width;
 
 
-    if (GTK_WIDGET_REALIZED (myfixed))
-      gtk_widget_set_parent_window (widget, myfixed->bin_window);
-    
-    if (!IS_ONSCREEN (x, y))
-       GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
+    return GTK_WIDGET(pizza)->allocation.width - border*2;
+}
 
 
-    if (GTK_WIDGET_REALIZED (myfixed))
-        gtk_widget_realize (widget);
 
 
-    gtk_widget_set_usize (widget, width, height);
-    
-    if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget))
-    {
-        if (GTK_WIDGET_MAPPED (myfixed))
-           gtk_widget_map (widget);
-      
-        gtk_widget_queue_resize (widget);
-    }
+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_move (GtkMyFixed    *myfixed,
-                  GtkWidget     *widget,
-                  gint         x,
-                  gint         y)
+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)
-        {
-           if ((child->x == x) && (child->y == y))
-               break;
-           
-            child->x = x;
-            child->y = y;
-           
-           if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
-               gtk_widget_queue_resize (widget);
-           break;
-       }
-    }
-}
+    child_info = g_new (GtkPizzaChild, 1);
 
 
-void
-gtk_myfixed_resize (GtkMyFixed     *myfixed,
-                    GtkWidget      *widget,
-                   gint         width,
-                   gint         height)
-{
-    GtkMyFixedChild *child;
-    GList *children;
+    child_info->widget = widget;
+    child_info->x = x;
+    child_info->y = y;
 
 
-    g_return_if_fail (myfixed != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (myfixed));
-    g_return_if_fail (widget != NULL);
+    pizza->children = g_list_append (pizza->children, child_info);
 
 
-    children = myfixed->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
-      
-        if (child->widget == widget)
-        {
-           if ((child->width == width) && (child->height == height))
-               break;
-           
-            child->width = width;
-            child->height = height;
-           
-           gtk_widget_set_usize (widget, width, height);
-           
-            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
-               gtk_widget_queue_resize (widget);
-           break;
-       }
-    }
+    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,
-                      gint        x,
-                      gint         y,
-                     gint         width,
-                     gint         height)
-{
-    GtkMyFixedChild *child;
+gtk_pizza_set_size (GtkPizza   *pizza,
+                    GtkWidget  *widget,
+                    gint        x,
+                    gint        y,
+                    gint        width,
+                    gint        height)
+{
+    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;
@@ -378,207 +355,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;
-           
-           gtk_widget_set_usize (widget, width, height);
-           
-            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
-               gtk_widget_queue_resize (widget);
-                   
+            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
             return;
         }
     }
 }
 
 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_IS_OFFSCREEN (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);
     gdk_window_show (widget->window);
-    gdk_window_show (myfixed->bin_window);
+    gdk_window_show (pizza->bin_window);
 }
 
 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;
-    GtkMyFixedChild *child;
+    GtkPizzaChild *child;
     GList *children;
     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;
-  
+
     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_MYSHADOW_NONE)
-    {
-        /* no border, no changes to sizes */
-    } else
-    if (myfixed->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;
-    }
-    
     /* minimal size */
     if (attributes.width < 2) attributes.width = 2;
     if (attributes.height < 2) attributes.height = 2;
     /* minimal size */
     if (attributes.width < 2) attributes.width = 2;
     if (attributes.height < 2) attributes.height = 2;
-    
+
+    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 = 
-       GDK_VISIBILITY_NOTIFY_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);
 
     attributes.x = 0;
     attributes.y = 0;
     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 = 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;
-
-    myfixed->bin_window = gdk_window_new (widget->window,
-                                         &attributes, attributes_mask);
-    gdk_window_set_user_data (myfixed->bin_window, 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, myfixed->bin_window, GTK_STATE_NORMAL);
-    
-    /* add filters for intercepting visibility and expose events */
-    gdk_window_add_filter (widget->window, gtk_myfixed_main_filter, myfixed);
-    gdk_window_add_filter (myfixed->bin_window, gtk_myfixed_filter, myfixed);
+    gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL );
 
 
-    /* we NEED gravity or we'll give up */
-    gravity_works = gdk_window_set_static_gravities (myfixed->bin_window, TRUE);
+/*
+    gdk_window_set_back_pixmap( widget->window, NULL, FALSE );
+    gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
+*/
 
     /* cannot be done before realisation */
 
     /* cannot be done before realisation */
-    children = myfixed->children;
+    children = pizza->children;
     while (children)
     {
         child = children->data;
         children = children->next;
 
     while (children)
     {
         child = children->data;
         children = children->next;
 
-        gtk_widget_set_parent_window (child->widget, myfixed->bin_window);
+        gtk_widget_set_parent_window (child->widget, pizza->bin_window);
     }
 }
 
     }
 }
 
-static void 
-gtk_myfixed_unrealize (GtkWidget *widget)
+static void
+gtk_pizza_unrealize (GtkWidget *widget)
 {
 {
-  GtkMyFixed *myfixed;
+    GtkPizza *pizza;
 
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MYFIXED (widget));
+    g_return_if_fail (widget != NULL);
+    g_return_if_fail (GTK_IS_PIZZA (widget));
 
 
-  myfixed = GTK_MYFIXED (widget);
+    pizza = GTK_PIZZA (widget);
 
 
-  gdk_window_set_user_data (myfixed->bin_window, NULL);
-  gdk_window_destroy (myfixed->bin_window);
-  myfixed->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 (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;
@@ -586,201 +554,150 @@ 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 x,y,w,h;
     gint border;
     gint x,y,w,h;
-    GtkMyFixedChild *child;
-    GtkAllocation child_allocation; 
+    GtkPizzaChild *child;
     GList *children;
     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 (myfixed->shadow_type == GTK_MYSHADOW_NONE)
-        border = 0;
-    else
-    if (myfixed->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( myfixed->bin_window, 0, 0, w, h );
-    }
-    
-    children = myfixed->children;
-    while (children)
+
+    if (GTK_WIDGET_REALIZED(widget))
     {
     {
-        child = children->data;
-        children = children->next;
- 
-        gtk_myfixed_position_child (myfixed, child);
-        gtk_myfixed_allocate_child (myfixed, child);
-    }
-}
+        border = pizza->container.border_width;
 
 
-static void
-gtk_myfixed_draw (GtkWidget    *widget,
-                 GdkRectangle *area)
-{
-    GtkMyFixed *myfixed;
-    GtkMyFixedChild *child;
-    GdkRectangle child_area;
-    GList *children;
+        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;
 
 
-    g_return_if_fail (widget != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (widget));
+        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 );
 
 
-    myfixed = GTK_MYFIXED (widget);
-      
-    children = myfixed->children;
-    if ( !(GTK_WIDGET_APP_PAINTABLE (widget)) &&
-         (myfixed->clear_on_draw))
-    {
-        gdk_window_clear_area( myfixed->bin_window,
-                               area->x, area->y, area->width, area->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 = pizza->children;
     while (children)
     {
     while (children)
     {
-       child = children->data;
-       children = children->next;
+        child = children->data;
+        children = children->next;
 
 
-       if (gtk_widget_intersect (child->widget, area, &child_area))
-           gtk_widget_draw (child->widget, &child_area);
+        gtk_pizza_allocate_child (pizza, child);
     }
 }
 
     }
 }
 
-static gint
-gtk_myfixed_expose (GtkWidget      *widget,
-                   GdkEventExpose *event)
+static void
+gtk_pizza_style_set(GtkWidget *widget, GtkStyle  *previous_style)
 {
 {
-    GtkMyFixed *myfixed;
-    GtkMyFixedChild *child;
-    GdkEventExpose child_event;
-    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);
-
-    myfixed = GTK_MYFIXED (widget);
-
-/*
-    if (event->window == widget->window)
-    {
-        gtk_myfixed_draw_border( myfixed );
-        return FALSE;
-    }
-*/
-
-    if (event->window != myfixed->bin_window)
-        return FALSE;
-
-    children = myfixed->children;
-    while (children)
+    if (GTK_WIDGET_REALIZED(widget))
     {
     {
-       child = children->data;
-       children = children->next;
-
-        child_event = *event;
-
-       if (GTK_WIDGET_NO_WINDOW (child->widget) &&
-           GTK_WIDGET_DRAWABLE (child->widget) &&
-           gtk_widget_intersect (child->widget, &event->area, &child_event.area))
-       {
-           gtk_widget_event (child->widget, (GdkEvent*) &child_event);
-       }
+        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;
+    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 (container != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (container));
+    g_return_if_fail (GTK_IS_PIZZA (container));
     g_return_if_fail (widget != NULL);
 
     g_return_if_fail (widget != NULL);
 
-    gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0, 20, 20 );
+    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;
+    GtkPizza *pizza;
+    GtkPizzaChild *child;
     GList *children;
 
     g_return_if_fail (container != NULL);
     GList *children;
 
     g_return_if_fail (container != NULL);
-    g_return_if_fail (GTK_IS_MYFIXED (container));
+    g_return_if_fail (GTK_IS_PIZZA (container));
     g_return_if_fail (widget != NULL);
 
     g_return_if_fail (widget != NULL);
 
-    myfixed = GTK_MYFIXED (container);
+    pizza = GTK_PIZZA (container);
 
 
-    children = myfixed->children;
+    children = pizza->children;
     while (children)
     {
         child = children->data;
 
         if (child->widget == widget)
     while (children)
     {
         child = children->data;
 
         if (child->widget == widget)
-       {
-           gtk_widget_unparent (widget);
+        {
+            gtk_widget_unparent (widget);
 
             /* security checks */
             g_return_if_fail (GTK_IS_WIDGET (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);
 
             /* security checks */
 
             /* security checks */
-           g_return_if_fail (GTK_IS_WIDGET (widget));
-    
-            GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
-           
-           break;
-       }
+            g_return_if_fail (GTK_IS_WIDGET (widget));
+
+            break;
+        }
 
         children = children->next;
     }
 }
 
 static void
 
         children = children->next;
     }
 }
 
 static void
-gtk_myfixed_forall (GtkContainer *container,
-                  gboolean      include_internals,
-                  GtkCallback   callback,
-                  gpointer      callback_data)
+gtk_pizza_forall (GtkContainer *container,
+                  gboolean      include_internals,
+                  GtkCallback   callback,
+                  gpointer      callback_data)
 {
 {
-    GtkMyFixed *myfixed;
-    GtkMyFixedChild *child;
+    GtkPizza *pizza;
+    GtkPizzaChild *child;
     GList *children;
 
     g_return_if_fail (container != NULL);
     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 (GTK_IS_PIZZA (container));
+    g_return_if_fail (callback != (GtkCallback)NULL);
 
 
-    myfixed = GTK_MYFIXED (container);
+    pizza = GTK_PIZZA (container);
 
 
-    children = myfixed->children;
+    children = pizza->children;
     while (children)
     {
         child = children->data;
     while (children)
     {
         child = children->data;
@@ -790,436 +707,93 @@ gtk_myfixed_forall (GtkContainer *container,
     }
 }
 
     }
 }
 
-
-/* Operations on children
- */
-
-static void
-gtk_myfixed_position_child (GtkMyFixed      *myfixed,
-                          GtkMyFixedChild *child)
-{
-    gint x;
-    gint y;
-
-    x = child->x - myfixed->xoffset;
-    y = child->y - myfixed->yoffset;
-
-    if (IS_ONSCREEN (x,y))
-    {
-        if (GTK_WIDGET_MAPPED (myfixed) &&
-         GTK_WIDGET_VISIBLE (child->widget))
-       {
-           if (!GTK_WIDGET_MAPPED (child->widget))
-               gtk_widget_map (child->widget);
-       }
-
-        if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
-           GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
-    }
-    else
-    {
-        if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
-           GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
-
-        if (GTK_WIDGET_MAPPED (child->widget))
-           gtk_widget_unmap (child->widget);
-    }
-}
-
 static void
 static void
-gtk_myfixed_allocate_child (GtkMyFixed      *myfixed,
-                          GtkMyFixedChild *child)
+gtk_pizza_allocate_child (GtkPizza      *pizza,
+                          GtkPizzaChild *child)
 {
     GtkAllocation allocation;
     GtkRequisition requisition;
 
 {
     GtkAllocation allocation;
     GtkRequisition requisition;
 
-    allocation.x = child->x - myfixed->xoffset;
-    allocation.y = child->y - myfixed->yoffset;
+    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;
     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_myfixed_position_children (GtkMyFixed *myfixed)
-{
-    GList *tmp_list;
-
-    tmp_list = myfixed->children;
-    while (tmp_list)
+    if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL)
     {
     {
-        GtkMyFixedChild *child = tmp_list->data;
-        tmp_list = tmp_list->next;
-      
-        gtk_myfixed_position_child (myfixed, child);
+        /* reverse horizontal placement */
+        gint offset,border;
+
+        offset = GTK_WIDGET(pizza)->allocation.width;
+        border = pizza->container.border_width;
+        offset -= border*2;
+
+        allocation.x = offset - child->x - allocation.width + pizza->m_xoffset;
     }
     }
+
+    gtk_widget_size_allocate (child->widget, &allocation);
 }
 
 static void
 }
 
 static void
-gtk_myfixed_adjust_allocations_recurse (GtkWidget *widget,
-                                      gpointer   cb_data)
+gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
+                                       gpointer   cb_data)
 {
 {
-    GtkMyFixedAdjData *data = 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))
     {
 
     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_myfixed_adjust_allocations_recurse,
-                         cb_data);
-    }
-}
-
-static void
-gtk_myfixed_adjust_allocations (GtkMyFixed *myfixed,
-                              gint       dx,
-                              gint       dy)
-{
-  GList *tmp_list;
-  GtkMyFixedAdjData data;
-
-  data.dx = dx;
-  data.dy = dy;
-
-  tmp_list = myfixed->children;
-  while (tmp_list)
-    {
-      GtkMyFixedChild *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_myfixed_adjust_allocations_recurse,
-                             &data);
+        gtk_container_forall (GTK_CONTAINER (widget),
+                          gtk_pizza_adjust_allocations_recurse,
+                          cb_data);
     }
 }
     }
 }
-  
-/* Callbacks */
 
 
-/* Send a synthetic expose event to the widget
- */
 static void
 static void
-gtk_myfixed_expose_area (GtkMyFixed    *myfixed,
-                       gint x, gint y, gint width, gint height)
+gtk_pizza_adjust_allocations (GtkPizza *pizza,
+                               gint       dx,
+                               gint       dy)
 {
 {
-  if (myfixed->visibility == GDK_VISIBILITY_UNOBSCURED)
-    {
-      GdkEventExpose event;
-      
-      event.type = GDK_EXPOSE;
-      event.send_event = TRUE;
-      event.window = myfixed->bin_window;
-      event.count = 0;
-      
-      event.area.x = x;
-      event.area.y = y;
-      event.area.width = width;
-      event.area.height = height;
-      
-      gdk_window_ref (event.window);
-      gtk_widget_event (GTK_WIDGET (myfixed), (GdkEvent *)&event);
-      gdk_window_unref (event.window);
-    }
-}
-
-/* This function is used to find events to process while scrolling
- */
-
-static Bool 
-gtk_myfixed_expose_predicate (Display *display, 
-                 XEvent  *xevent, 
-                 XPointer arg)
-{
-  if ((xevent->type == Expose) || 
-      ((xevent->xany.window == *(Window *)arg) &&
-       (xevent->type == ConfigureNotify)))
-    return True;
-  else
-    return False;
-}
-
-/* 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_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy)
-{
-  GtkWidget *widget;
-  XEvent xevent;
-
-  gint x,y,w,h,border;
-  
-  widget = GTK_WIDGET (myfixed);
-
-  myfixed->xoffset += dx;
-  myfixed->yoffset += dy;
-
-  if (!GTK_WIDGET_MAPPED (myfixed))
-    {
-      gtk_myfixed_position_children (myfixed);
-      return;
-    }
-
-  gtk_myfixed_adjust_allocations (myfixed, -dx, -dy);
-
-  if (myfixed->shadow_type == GTK_MYSHADOW_NONE)
-    border = 0;
-  else
-  if (myfixed->shadow_type == GTK_MYSHADOW_THIN)
-    border = 1;
-  else
-    border = 2;
-       
-  x = 0;
-  y = 0;
-  w = widget->allocation.width - 2*border;
-  h = widget->allocation.height - 2*border;
-  
-  if (dx > 0)
-    {
-      if (gravity_works)
-       {
-         gdk_window_resize (myfixed->bin_window,
-                            w + dx,
-                            h);
-         gdk_window_move   (myfixed->bin_window, x-dx, y);
-         gdk_window_move_resize (myfixed->bin_window, x, y, w, h );
-       }
-      else
-       {
-         /* FIXME */
-       }
-
-      gtk_myfixed_expose_area (myfixed, 
-                             MAX ((gint)w - dx, 0),
-                             0,
-                             MIN (dx, w),
-                             h);
-    }
-  else if (dx < 0)
-    {
-      if (gravity_works)
-       {
-         gdk_window_move_resize (myfixed->bin_window,
-                                 x + dx, 
-                                 y,
-                                 w - dx,
-                                 h);
-         gdk_window_move   (myfixed->bin_window, x, y);
-         gdk_window_resize (myfixed->bin_window, w, h );
-       }
-      else
-       {
-         /* FIXME */
-       }
-
-      gtk_myfixed_expose_area (myfixed,
-                             0,
-                             0,
-                             MIN (-dx, w),
-                             h);
-    }
+    GList *tmp_list;
+    GtkPizzaAdjData data;
 
 
-  if (dy > 0)
-    {
-      if (gravity_works)
-       {
-         gdk_window_resize (myfixed->bin_window, w, h + dy);
-         gdk_window_move   (myfixed->bin_window, x, y-dy);
-         gdk_window_move_resize (myfixed->bin_window,
-                                 x, y, w, h );
-       }
-      else
-       {
-         /* FIXME */
-       }
-
-      gtk_myfixed_expose_area (myfixed, 
-                             0,
-                             MAX ((gint)h - dy, 0),
-                             w,
-                             MIN (dy, h));
-    }
-  else if (dy < 0)
-    {
-      if (gravity_works)
-       {
-         gdk_window_move_resize (myfixed->bin_window,
-                                 x, y+dy, w, h - dy );
-         gdk_window_move   (myfixed->bin_window, x, y);
-         gdk_window_resize (myfixed->bin_window, w, h );
-       }
-      else
-       {
-         /* FIXME */
-       }
-      gtk_myfixed_expose_area (myfixed, 
-                             0,
-                             0,
-                             w,
-                             MIN (-dy, (gint)h));
-    }
+    data.dx = dx;
+    data.dy = dy;
 
 
-  gtk_myfixed_position_children (myfixed);
-
-  /* We have to make sure that all exposes from this scroll get
-   * processed before we scroll again, or the expose events will
-   * have invalid coordinates.
-   *
-   * We also do expose events for other windows, since otherwise
-   * their updating will fall behind the scrolling 
-   *
-   * This also avoids a problem in pre-1.0 GTK where filters don't
-   * have access to configure events that were compressed.
-   */
-
-  gdk_flush();
-  while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (myfixed->bin_window),
-                      &xevent,
-                      gtk_myfixed_expose_predicate,
-                      (XPointer)&GDK_WINDOW_XWINDOW (myfixed->bin_window)))
+    tmp_list = pizza->children;
+    while (tmp_list)
     {
     {
-      GdkEvent event;
-      GtkWidget *event_widget;
-
-      if ((xevent.xany.window == GDK_WINDOW_XWINDOW (myfixed->bin_window)) &&
-         (gtk_myfixed_filter (&xevent, &event, myfixed) == GDK_FILTER_REMOVE))
-       continue;
-      
-      if (xevent.type == Expose)
-       {
-         event.expose.window = gdk_window_lookup (xevent.xany.window);
-         gdk_window_get_user_data (event.expose.window, 
-                                   (gpointer *)&event_widget);
-
-         if (event_widget)
-           {
-             event.expose.type = GDK_EXPOSE;
-             event.expose.area.x = xevent.xexpose.x;
-             event.expose.area.y = xevent.xexpose.y;
-             event.expose.area.width = xevent.xexpose.width;
-             event.expose.area.height = xevent.xexpose.height;
-             event.expose.count = xevent.xexpose.count;
-             
-             gdk_window_ref (event.expose.window);
-             gtk_widget_event (event_widget, &event);
-             gdk_window_unref (event.expose.window);
-           }
-       }
-    }
-}
-
-/* The main event filter. Actually, we probably don't really need
- * to install this as a filter at all, since we are calling it
- * directly above in the expose-handling hack. But in case scrollbars
- * are fixed up in some manner...
- *
- * This routine identifies expose events that are generated when
- * we've temporarily moved the bin_window_origin, and translates
- * them or discards them, depending on whether we are obscured
- * or not.
- */
-static GdkFilterReturn 
-gtk_myfixed_filter (GdkXEvent *gdk_xevent,
-                  GdkEvent  *event,
-                  gpointer   data)
-{
-  XEvent *xevent;
-  GtkMyFixed *myfixed;
+        GtkPizzaChild *child = tmp_list->data;
+        tmp_list = tmp_list->next;
 
 
-  xevent = (XEvent *)gdk_xevent;
-  myfixed = GTK_MYFIXED (data);
+        child->widget->allocation.x += dx;
+        child->widget->allocation.y += dy;
 
 
-  switch (xevent->type)
-    {
-    case Expose:
-      if (xevent->xexpose.serial == myfixed->configure_serial)
-       {
-         if (myfixed->visibility == GDK_VISIBILITY_UNOBSCURED)
-           return GDK_FILTER_REMOVE;
-         else
-           {
-             xevent->xexpose.x += myfixed->scroll_x;
-             xevent->xexpose.y += myfixed->scroll_y;
-             
-             break;
-           }
-       }
-      break;
-      
-    case ConfigureNotify:
-       if ((xevent->xconfigure.x != 0) || (xevent->xconfigure.y != 0))
-       {
-         myfixed->configure_serial = xevent->xconfigure.serial;
-         myfixed->scroll_x = xevent->xconfigure.x;
-         myfixed->scroll_y = xevent->xconfigure.y;
-       }
-      break;
+        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);
+        }
     }
     }
-  
-  return GDK_FILTER_CONTINUE;
 }
 
 }
 
-/* Although GDK does have a GDK_VISIBILITY_NOTIFY event,
- * there is no corresponding event in GTK, so we have
- * to get the events from a filter
- */
-static GdkFilterReturn 
-gtk_myfixed_main_filter (GdkXEvent *gdk_xevent,
-                       GdkEvent  *event,
-                       gpointer   data)
+void
+gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
 {
 {
-  XEvent *xevent;
-  GtkMyFixed *myfixed;
+    pizza->m_xoffset += dx;
+    pizza->m_yoffset += dy;
 
 
-  xevent = (XEvent *)gdk_xevent;
-  myfixed = GTK_MYFIXED (data);
+    gtk_pizza_adjust_allocations (pizza, -dx, -dy);
 
 
-  if (xevent->type == VisibilityNotify)
-    {
-      switch (xevent->xvisibility.state)
-       {
-       case VisibilityFullyObscured:
-         myfixed->visibility = GDK_VISIBILITY_FULLY_OBSCURED;
-         break;
-
-       case VisibilityPartiallyObscured:
-         myfixed->visibility = GDK_VISIBILITY_PARTIAL;
-         break;
-
-       case VisibilityUnobscured:
-         myfixed->visibility = GDK_VISIBILITY_UNOBSCURED;
-         break;
-       }
-
-      return GDK_FILTER_REMOVE;
-    }
-
-  
-  return GDK_FILTER_CONTINUE;
+    if (pizza->bin_window)
+        gdk_window_scroll( pizza->bin_window, -dx, -dy );
 }
 
 }
 
-
-
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
wxWidgets (Impactor)