rename Inside(x,y) parameters to avoid gcc warnings about parameters shadowing member...

[wxWidgets.git] / include / wx / gtk / win_gtk.h

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index 65c0ba54f0699d92662e87c3f33d2a62fd09d289..1bfeaa799ea61b249834db98ff34a1345c316875 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -22,52 +22,17 @@ extern "C" {
 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
 
-/* Shadow types */
-typedef enum
-{
-    GTK_MYSHADOW_NONE,
-    GTK_MYSHADOW_THIN,
-    GTK_MYSHADOW_IN,
-    GTK_MYSHADOW_OUT
-} GtkMyShadowType;
-
-typedef struct _GtkPizzaChild    GtkPizzaChild;
 typedef struct _GtkPizza        GtkPizza;
-typedef struct _GtkPizzaClass   GtkPizzaClass;
-
-struct _GtkPizzaChild
-{
-    GtkWidget *widget;
-    gint x;
-    gint y;
-    gint width;
-    gint height;
-};
 
 struct _GtkPizza
 {
     GtkContainer container;
     GList *children;
-    GtkMyShadowType shadow_type;
-
-    guint width;
-    guint height;
-
-    guint xoffset;
-    guint yoffset;
 
+    guint m_xoffset;
+    guint m_yoffset;
+    
     GdkWindow *bin_window;
-
-    gboolean external_expose;
-};
-
-struct _GtkPizzaClass
-{
-  GtkContainerClass parent_class;
-
-  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
-                                     GtkAdjustment  *hadjustment,
-                                     GtkAdjustment  *vadjustment);
 };
 
 WXDLLIMPEXP_CORE
@@ -75,13 +40,21 @@ GtkType    gtk_pizza_get_type        (void);
 WXDLLIMPEXP_CORE
 GtkWidget* gtk_pizza_new             (void);
 
+/* accessors */
+
+WXDLLIMPEXP_CORE
+gint       gtk_pizza_get_xoffset     (GtkPizza          *pizza); 
 WXDLLIMPEXP_CORE
-void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
-                                      GtkMyShadowType    type);
+gint       gtk_pizza_get_yoffset     (GtkPizza          *pizza); 
+WXDLLIMPEXP_CORE
+void       gtk_pizza_set_xoffset     (GtkPizza          *pizza, gint xoffset); 
+WXDLLIMPEXP_CORE
+void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset); 
+
 
 WXDLLIMPEXP_CORE
-void       gtk_pizza_set_external    (GtkPizza          *pizza,
-                                      gboolean           expose);
+gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza); 
+
 
 WXDLLIMPEXP_CORE
 void       gtk_pizza_scroll          (GtkPizza          *pizza,