Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

[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 38901e8f1dd29b91b445926310ef779ca6bb2645..d27296eb130372d27e42146389fdd89c88234857 100644 (file)
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -1,21 +1,20 @@
-/////////////////////////////////////////////////////////////////////////////
+/* ///////////////////////////////////////////////////////////////////////////

 // Name:        win_gtk.h
 // Purpose:     wxWindows's GTK base widget
 // Author:      Robert Roebling
 // 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
 // Licence:    wxWindows licence

-/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////// */

 
 
 #ifndef __GTK_MYFIXED_H__
 #define __GTK_MYFIXED_H__
 
 
 
 #ifndef __GTK_MYFIXED_H__
 #define __GTK_MYFIXED_H__
 

-

 #include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>

-
+#include <gtk/gtkadjustment.h>
+#include <gtk/gtkfeatures.h>

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -34,13 +33,21 @@ typedef struct _GtkMyFixedChild   GtkMyFixedChild;
 struct _GtkMyFixed
 {
   GtkContainer container;
 struct _GtkMyFixed
 {
   GtkContainer container;

-

   GList *children;
   GList *children;

+#if (GTK_MINOR_VERSION > 0)
+  GtkShadowType shadow_type;
+#endif

 };
 
 struct _GtkMyFixedClass
 {
   GtkContainerClass parent_class;
 };
 
 struct _GtkMyFixedClass
 {
   GtkContainerClass parent_class;

+
+#if (GTK_MINOR_VERSION > 0)
+  void  (*set_scroll_adjustments)   (GtkMyFixed     *myfixed,
+                                    GtkAdjustment  *hadjustment,
+                                    GtkAdjustment  *vadjustment);
+#endif

 };
 
 struct _GtkMyFixedChild
 };
 
 struct _GtkMyFixedChild


@@ -48,19 +55,39 @@ struct _GtkMyFixedChild
   GtkWidget *widget;
   gint16 x;
   gint16 y;
   GtkWidget *widget;
   gint16 x;
   gint16 y;

+  gint16 width;
+  gint16 height;

 };
 
 guint      gtk_myfixed_get_type        (void);
 GtkWidget* gtk_myfixed_new             (void);
 };
 
 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,
 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,
 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 */
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */