X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e014a0c44e36efe429bea1303f4309af287eb77..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/gtk/win_gtk.h?ds=sidebyside

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index ac04b3c0ef..a6c5180f4e 100644
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -1,104 +1,88 @@
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.h
-// Purpose:     wxWindows's GTK base widget
+// Purpose:     wxWidgets's GTK base widget = GtkPizza
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
 
-#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 <gtk/gtkcontainer.h>
 
-#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 ())
-
-/* Shadow types */
-typedef enum
-{
-  GTK_MYSHADOW_NONE,
-  GTK_MYSHADOW_THIN,
-  GTK_MYSHADOW_IN,
-  GTK_MYSHADOW_OUT,
-} GtkMyShadowType;
-
-typedef struct _GtkMyFixed        GtkMyFixed;
-typedef struct _GtkMyFixedClass   GtkMyFixedClass;
-typedef struct _GtkMyFixedChild   GtkMyFixedChild;
-
-struct _GtkMyFixed
-{
-  GtkContainer container;
-  GList *children;
-#if (GTK_MINOR_VERSION > 0)
-  GtkMyShadowType shadow_type;
-#endif
-};
+#include "wx/dlimpexp.h"
 
-struct _GtkMyFixedClass
-{
-  GtkContainerClass parent_class;
+#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 ())
 
-#if (GTK_MINOR_VERSION > 0)
-  void  (*set_scroll_adjustments)   (GtkMyFixed     *myfixed,
-				     GtkAdjustment  *hadjustment,
-				     GtkAdjustment  *vadjustment);
-#endif
-};
+typedef struct _GtkPizza        GtkPizza;
 
-struct _GtkMyFixedChild
+struct _GtkPizza
 {
-  GtkWidget *widget;
-  gint16 x;
-  gint16 y;
-  gint16 width;
-  gint16 height;
+    GtkContainer container;
+    GList *children;
+
+    guint m_xoffset;
+    guint m_yoffset;
+    
+    gboolean m_noscroll;
+    
+    GdkWindow *bin_window;
 };
 
-guint      gtk_myfixed_get_type        (void);
-GtkWidget* gtk_myfixed_new             (void);
-#if (GTK_MINOR_VERSION > 0)
-void       gtk_myfixed_set_shadow_type (GtkMyFixed     *myfixed,
-				        GtkMyShadowType  type);
-#endif
-void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
-                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y,
-					gint16         width,
-					gint16         height);
-
-void       gtk_myfixed_move            (GtkMyFixed     *myfixed,
-                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y );
-					
-void       gtk_myfixed_resize          (GtkMyFixed     *myfixed,
-                                        GtkWidget      *widget,
-                                        gint16         width,
-                                        gint16         height );
-					
-void       gtk_myfixed_set_size        (GtkMyFixed     *myfixed,
-                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y,
-                                        gint16         width,
-                                        gint16         height);
+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 */
+
+WXDLLIMPEXP_CORE
+gint       gtk_pizza_get_xoffset     (GtkPizza          *pizza); 
+WXDLLIMPEXP_CORE
+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
+gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza); 
+
+
+WXDLLIMPEXP_CORE
+void       gtk_pizza_scroll          (GtkPizza          *pizza,
+                                      gint               dx,
+                                      gint               dy);
+
+WXDLLIMPEXP_CORE
+void       gtk_pizza_put             (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               x,
+                                      gint               y,
+                                      gint               width,
+                                      gint               height);
+
+WXDLLIMPEXP_CORE
+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__ */