X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6959763942eb0e852113945c54113f3521b9c26f..20671963efabd70a208b415c4734ee813b9eb439:/src/gtk/win_gtk.c

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 6e473cfa67..6115bc3a33 100644
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -64,8 +64,7 @@ static void  gtk_pizza_scroll_set_adjustments (GtkPizza      *pizza,
                                                GtkAdjustment *hadj,
                                                GtkAdjustment *vadj);
 
-/* static */
-GtkContainerClass *pizza_parent_class = NULL;
+static GtkWidgetClass* pizza_parent_class;
 
 GtkType
 gtk_pizza_get_type ()
@@ -195,8 +194,6 @@ gtk_pizza_init (GtkPizza *pizza)
     pizza->m_yoffset = 0;
     
     pizza->m_width = -1;
-
-    pizza->external_expose = FALSE;
 }
 
 GtkWidget*
@@ -243,6 +240,21 @@ void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset)
     // do something
 }
 
+gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza)
+{
+    gint width;
+
+    g_return_val_if_fail ( (pizza != NULL), 0 );
+    g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), 0 );
+    
+    if (!pizza->bin_window) return 0;
+    
+    gdk_window_get_geometry( pizza->bin_window, NULL, NULL, &width, NULL, NULL );
+    
+    return width;
+}
+
+
 static void
 gtk_pizza_scroll_set_adjustments (GtkPizza     *pizza,
                                     GtkAdjustment  *hadj,
@@ -270,16 +282,6 @@ gtk_pizza_set_shadow_type (GtkPizza        *pizza,
     }
 }
 
-void
-gtk_pizza_set_external (GtkPizza  *pizza,
-                        gboolean   expose)
-{
-    g_return_if_fail (pizza != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (pizza));
-
-    pizza->external_expose = expose;
-}
-
 void
 gtk_pizza_put (GtkPizza   *pizza,
                GtkWidget  *widget,
@@ -529,8 +531,8 @@ gtk_pizza_unrealize (GtkWidget *widget)
     gdk_window_destroy (pizza->bin_window);
     pizza->bin_window = NULL;
 
-    if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize)
-       (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget);
+    if (pizza_parent_class->unrealize)
+        pizza_parent_class->unrealize(widget);
 }
 
 static void
@@ -627,16 +629,12 @@ gtk_pizza_expose (GtkWidget      *widget,
     g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);
     g_return_val_if_fail (event != NULL, FALSE);
 
-    pizza = GTK_PIZZA (widget);
+    pizza = (GtkPizza*)widget;
 
     if (event->window != pizza->bin_window)
         return FALSE;
 
-    /* We handle all expose events in window.cpp now. */
-    if (pizza->external_expose)
-        return FALSE;
-
-    (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event);
+    pizza_parent_class->expose_event(widget, event);
 
     return FALSE;
 }
@@ -650,7 +648,7 @@ gtk_pizza_style_set(GtkWidget *widget, GtkStyle  *previous_style)
         gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL );
     }
 
-    (* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style);
+    pizza_parent_class->style_set(widget, previous_style);
 }
 
 static void