X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdd3ed7a8f5e43d44fffef5c7f857f6256dcc67a..72cdf4c9b3ce92addf09cfb322f0c19bfb0f8744:/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 d27296eb13..e48944e75f 100644
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -25,69 +25,85 @@ extern "C" {
 #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)
-  GtkShadowType shadow_type;
-#endif
+  GtkMyShadowType shadow_type;
+  
+  guint width;
+  guint height;
+
+  guint xoffset;
+  guint yoffset;
+
+  GdkWindow *bin_window;
+
+  GdkVisibilityState visibility;
+  gulong configure_serial;
+  gint scroll_x;
+  gint scroll_y;
+  
+  gboolean clear_on_draw;
 };
 
 struct _GtkMyFixedClass
 {
   GtkContainerClass parent_class;
 
-#if (GTK_MINOR_VERSION > 0)
   void  (*set_scroll_adjustments)   (GtkMyFixed     *myfixed,
 				     GtkAdjustment  *hadjustment,
 				     GtkAdjustment  *vadjustment);
-#endif
-};
-
-struct _GtkMyFixedChild
-{
-  GtkWidget *widget;
-  gint16 x;
-  gint16 y;
-  gint16 width;
-  gint16 height;
 };
 
 guint      gtk_myfixed_get_type        (void);
 GtkWidget* gtk_myfixed_new             (void);
-#if (GTK_MINOR_VERSION > 0)
+
 void       gtk_myfixed_set_shadow_type (GtkMyFixed     *myfixed,
-				        GtkShadowType  type);
-#endif
+				        GtkMyShadowType  type);
+					
+void       gtk_my_fixed_set_clear      (GtkMyFixed     *myfixed,
+                                        gboolean        clear);		
+					
+void       gtk_myfixed_scroll          	(GtkMyFixed     *myfixed,	
+                                         gint         dx,
+                                         gint         dy);
+					
 void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
                                         GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y,
-					gint16         width,
-					gint16         height);
+                                        gint         x,
+                                        gint         y,
+					gint         width,
+					gint         height);
 
 void       gtk_myfixed_move            (GtkMyFixed     *myfixed,
                                         GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y );
+                                        gint         x,
+                                        gint         y );
 					
 void       gtk_myfixed_resize          (GtkMyFixed     *myfixed,
                                         GtkWidget      *widget,
-                                        gint16         width,
-                                        gint16         height );
+                                        gint         width,
+                                        gint         height );
 					
 void       gtk_myfixed_set_size        (GtkMyFixed     *myfixed,
                                         GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y,
-                                        gint16         width,
-                                        gint16         height);
+                                        gint         x,
+                                        gint         y,
+                                        gint         width,
+                                        gint         height);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */