fixed compilation and added support for all 4 images (as a side effect) to the

[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 d27296eb130372d27e42146389fdd89c88234857..ac04b3c0efc2d0496a57ee3dd72e460655a730df 100644 (file)
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -25,6 +25,14 @@ 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 ())
 
 #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 _GtkMyFixed        GtkMyFixed;
 typedef struct _GtkMyFixedClass   GtkMyFixedClass;


@@ -35,7 +43,7 @@ struct _GtkMyFixed
   GtkContainer container;
   GList *children;
 #if (GTK_MINOR_VERSION > 0)
   GtkContainer container;
   GList *children;
 #if (GTK_MINOR_VERSION > 0)

-  GtkShadowType shadow_type;
+  GtkMyShadowType shadow_type;

 #endif
 };
 
 #endif
 };
 


@@ -63,7 +71,7 @@ guint      gtk_myfixed_get_type        (void);
 GtkWidget* gtk_myfixed_new             (void);
 #if (GTK_MINOR_VERSION > 0)
 void       gtk_myfixed_set_shadow_type (GtkMyFixed     *myfixed,
 GtkWidget* gtk_myfixed_new             (void);
 #if (GTK_MINOR_VERSION > 0)
 void       gtk_myfixed_set_shadow_type (GtkMyFixed     *myfixed,

-                                       GtkShadowType  type);
+                                       GtkMyShadowType  type);

 #endif
 void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
                                         GtkWidget      *widget,
 #endif
 void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
                                         GtkWidget      *widget,