Restored wxSizeEvent code form last week -> wxGLCanvas

[wxWidgets.git] / include / wx / gtk1 / win_gtk.h

diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h
index ac04b3c0efc2d0496a57ee3dd72e460655a730df..e48944e75fe4a3760c6fcdf35b19edc11373ce1f 100644 (file)
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -31,71 +31,79 @@ typedef enum
   GTK_MYSHADOW_NONE,
   GTK_MYSHADOW_THIN,
   GTK_MYSHADOW_IN,
-  GTK_MYSHADOW_OUT,
+  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
+  
+  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,
                                        GtkMyShadowType  type);
-#endif
+                                       
+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 */