X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da048e3d4c244a0d0b42e6e6970ad895ea948a53..b6e5eaa59701315ca06996ff845872ca4122695f:/include/wx/gtk1/win_gtk.h

diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h
index 1029d03f85..adb100078b 100644
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -14,13 +14,14 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
+#ifndef __WXGTK20__
 #include <gtk/gtkfeatures.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-
 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
 #define GTK_PIZZA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass)
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
@@ -28,35 +29,47 @@ extern "C" {
 /* Shadow types */
 typedef enum
 {
-  GTK_MYSHADOW_NONE,
-  GTK_MYSHADOW_THIN,
-  GTK_MYSHADOW_IN,
-  GTK_MYSHADOW_OUT
+    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;
+    GtkContainer container;
+    GList *children;
+    GtkMyShadowType shadow_type;
   
-  guint width;
-  guint height;
+    guint width;
+    guint height;
 
-  guint xoffset;
-  guint yoffset;
+    guint xoffset;
+    guint yoffset;
 
-  GdkWindow *bin_window;
+    GdkWindow *bin_window;
 
-  GdkVisibilityState visibility;
-  gulong configure_serial;
-  gint scroll_x;
-  gint scroll_y;
+    GdkVisibilityState visibility;
+    gulong configure_serial;
+    gint scroll_x;
+    gint scroll_y;
   
-  gboolean clear_on_draw;
+    gboolean clear_on_draw;
+    gboolean use_filter;
+    gboolean external_expose;
 };
 
 struct _GtkPizzaClass
@@ -71,39 +84,48 @@ struct _GtkPizzaClass
 guint      gtk_pizza_get_type        (void);
 GtkWidget* gtk_pizza_new             (void);
 
-void       gtk_pizza_set_shadow_type (GtkPizza     *pizza,
-				        GtkMyShadowType  type);
+void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
+				                      GtkMyShadowType    type);
 					
-void       gtk_pizza_set_clear      (GtkPizza     *pizza,
-                                        gboolean        clear);		
+void       gtk_pizza_set_clear       (GtkPizza          *pizza,
+                                      gboolean           clear);		
 					
-void       gtk_pizza_scroll          	(GtkPizza     *pizza,	
-                                         gint         dx,
-                                         gint         dy);
+void       gtk_pizza_set_filter      (GtkPizza          *pizza,
+                                      gboolean           use);		
+					
+void       gtk_pizza_set_external    (GtkPizza          *pizza,
+                                      gboolean           expose);		
+					
+void       gtk_pizza_scroll          (GtkPizza          *pizza,	
+                                      gint               dx,
+                                      gint               dy);
+
+gint       gtk_pizza_child_resized   (GtkPizza          *pizza,
+                                      GtkWidget         *widget);
 					
-void       gtk_pizza_put             (GtkPizza     *pizza,
-                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y,
-					gint         width,
-					gint         height);
-
-void       gtk_pizza_move            (GtkPizza     *pizza,
-                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y );
+void       gtk_pizza_put             (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               x,
+                                      gint               y,
+					                  gint               width,
+					                  gint               height);
+
+void       gtk_pizza_move            (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               x,
+                                      gint               y );
 					
-void       gtk_pizza_resize          (GtkPizza     *pizza,
-                                        GtkWidget      *widget,
-                                        gint         width,
-                                        gint         height );
+void       gtk_pizza_resize          (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               width,
+                                      gint               height );
 					
-void       gtk_pizza_set_size        (GtkPizza     *pizza,
-                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y,
-                                        gint         width,
-                                        gint         height);
+void       gtk_pizza_set_size        (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               x,
+                                      gint               y,
+                                      gint               width,
+                                      gint               height);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */