X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/147bc4915925b56454d45772c66145f14e33d23b..7da982c4ec7482410a235c6045ce4a57bc5dd762:/include/wx/gtk1/win_gtk.h?ds=sidebyside

diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h
index f12bc34655..6bd073219b 100644
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -1,6 +1,6 @@
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.h
-// Purpose:     wxWindows's GTK base widget
+// Purpose:     wxWindows's GTK base widget = GtkPizza
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
@@ -8,105 +8,128 @@
 /////////////////////////////////////////////////////////////////////////// */
 
 
-#ifndef __GTK_MYFIXED_H__
-#define __GTK_MYFIXED_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkfeatures.h>
+#ifndef __GTK_PIZZA_H__
+#define __GTK_PIZZA_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtkcontainer.h>
+#include <gtk/gtkadjustment.h>
+#ifndef __WXGTK20__
+#include <gtk/gtkfeatures.h>
+#endif
 
-#define GTK_MYFIXED(obj)          GTK_CHECK_CAST (obj, gtk_myfixed_get_type (), GtkMyFixed)
-#define GTK_MYFIXED_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_myfixed_get_type (), GtkMyFixedClass)
-#define GTK_IS_MYFIXED(obj)       GTK_CHECK_TYPE (obj, gtk_myfixed_get_type ())
+#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 ())
 
 /* 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 _GtkMyFixed        GtkMyFixed;
-typedef struct _GtkMyFixedClass   GtkMyFixedClass;
+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 _GtkMyFixed
+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 _GtkMyFixedClass
+struct _GtkPizzaClass
 {
   GtkContainerClass parent_class;
 
-  void  (*set_scroll_adjustments)   (GtkMyFixed     *myfixed,
+  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
 				     GtkAdjustment  *hadjustment,
 				     GtkAdjustment  *vadjustment);
 };
 
-guint      gtk_myfixed_get_type        (void);
-GtkWidget* gtk_myfixed_new             (void);
+guint      gtk_pizza_get_type        (void);
+GtkWidget* gtk_pizza_new             (void);
 
-void       gtk_myfixed_set_shadow_type (GtkMyFixed     *myfixed,
-				        GtkMyShadowType  type);
+void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
+				                      GtkMyShadowType    type);
 					
-void       gtk_my_fixed_set_clear      (GtkMyFixed     *myfixed,
-                                        gboolean        clear);		
+void       gtk_pizza_set_clear       (GtkPizza          *pizza,
+                                      gboolean           clear);		
 					
-void       gtk_myfixed_scroll          	(GtkMyFixed     *myfixed,	
-                                         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_myfixed_put             (GtkMyFixed     *myfixed,
-                                        GtkWidget      *widget,
-                                        gint         x,
-                                        gint         y,
-					gint         width,
-					gint         height);
-
-void       gtk_myfixed_move            (GtkMyFixed     *myfixed,
-                                        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_myfixed_resize          (GtkMyFixed     *myfixed,
-                                        GtkWidget      *widget,
-                                        gint         width,
-                                        gint         height );
+void       gtk_pizza_resize          (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               width,
+                                      gint               height );
 					
-void       gtk_myfixed_set_size        (GtkMyFixed     *myfixed,
-                                        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 */
 
 
-#endif /* __GTK_MYFIXED_H__ */
+#endif /* __GTK_PIZZA_H__ */