many wxItemContainer-related changes:

[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 34e665a4104af1920413b8d372f113500fbf58ef..a6c5180f4e4314f634e364e11ca8916c55350146 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -22,57 +22,27 @@ 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 ())
 
 #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 _GtkPizza        GtkPizza;

-typedef struct _GtkPizzaClass   GtkPizzaClass;
-
-struct _GtkPizzaChild
-{
-    GtkWidget *widget;
-    gint x;
-    gint y;
-    gint width;
-    gint height;
-};

 
 struct _GtkPizza
 {
     GtkContainer container;
     GList *children;
 
 struct _GtkPizza
 {
     GtkContainer container;
     GList *children;

-    GtkMyShadowType shadow_type;

 
     guint m_xoffset;
     guint m_yoffset;
     
 
     guint m_xoffset;
     guint m_yoffset;
     

-    gint  m_width;
-
+    gboolean m_noscroll;
+    

     GdkWindow *bin_window;
     GdkWindow *bin_window;

-
-    gboolean external_expose;
-};
-
-struct _GtkPizzaClass
-{
-  GtkContainerClass parent_class;
-
-  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
-                                     GtkAdjustment  *hadjustment,
-                                     GtkAdjustment  *vadjustment);

 };
 
 WXDLLIMPEXP_CORE
 GtkType    gtk_pizza_get_type        (void);
 WXDLLIMPEXP_CORE
 GtkWidget* gtk_pizza_new             (void);
 };
 
 WXDLLIMPEXP_CORE
 GtkType    gtk_pizza_get_type        (void);
 WXDLLIMPEXP_CORE
 GtkWidget* gtk_pizza_new             (void);

+WXDLLIMPEXP_CORE
+GtkWidget* gtk_pizza_new_no_scroll   (void);

 
 /* accessors */
 
 
 /* accessors */
 


@@ -87,12 +57,8 @@ void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset);
 
 
 WXDLLIMPEXP_CORE
 
 
 WXDLLIMPEXP_CORE

-void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
-                                      GtkMyShadowType    type);
+gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza); 

 
 

-WXDLLIMPEXP_CORE
-void       gtk_pizza_set_external    (GtkPizza          *pizza,
-                                      gboolean           expose);

 
 WXDLLIMPEXP_CORE
 void       gtk_pizza_scroll          (GtkPizza          *pizza,
 
 WXDLLIMPEXP_CORE
 void       gtk_pizza_scroll          (GtkPizza          *pizza,