X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..082b27986b4f0f6751c1482992fc0d9eae5a931e:/include/wx/gtk/win_gtk.h

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index d42e89bebe..d27296eb13 100644
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -2,9 +2,8 @@
 // Name:        win_gtk.h
 // Purpose:     wxWindows's GTK base widget
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
@@ -12,10 +11,10 @@
 #ifndef __GTK_MYFIXED_H__
 #define __GTK_MYFIXED_H__
 
-
 #include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
-
+#include <gtk/gtkadjustment.h>
+#include <gtk/gtkfeatures.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,13 +33,21 @@ typedef struct _GtkMyFixedChild   GtkMyFixedChild;
 struct _GtkMyFixed
 {
   GtkContainer container;
-
   GList *children;
+#if (GTK_MINOR_VERSION > 0)
+  GtkShadowType shadow_type;
+#endif
 };
 
 struct _GtkMyFixedClass
 {
   GtkContainerClass parent_class;
+
+#if (GTK_MINOR_VERSION > 0)
+  void  (*set_scroll_adjustments)   (GtkMyFixed     *myfixed,
+				     GtkAdjustment  *hadjustment,
+				     GtkAdjustment  *vadjustment);
+#endif
 };
 
 struct _GtkMyFixedChild
@@ -48,19 +55,39 @@ 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
 void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
                                         GtkWidget      *widget,
                                         gint16         x,
-                                        gint16         y);
+                                        gint16         y,
+					gint16         width,
+					gint16         height);
+
 void       gtk_myfixed_move            (GtkMyFixed     *myfixed,
                                         GtkWidget      *widget,
                                         gint16         x,
-                                        gint16         y);
-
+                                        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);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */