JPEG and PNG code taken out of image.cpp

[wxWidgets.git] / src / gtk1 / win_gtk.c

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index 0f2d927beaa22400e9fa5391403cb7629da1497c..ebbcadb5ac8efb8fa78411f732541e11b17596f9 100644 (file)
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -14,11 +14,9 @@
 // conditional compilation
 //------------------------------------------------------------------------- */
 
-#if (GTK_MINOR_VERSION == 1)
-#if (GTK_MICRO_VERSION >= 5)
+#if (GTK_MINOR_VERSION > 0)
 #define NEW_GTK_CONSTRUCT_CODE
 #endif
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,7 +44,7 @@ static void gtk_myfixed_add           (GtkContainer     *container,
 static void gtk_myfixed_remove        (GtkContainer     *container,
                                     GtkWidget        *widget);
 static void gtk_myfixed_foreach       (GtkContainer     *container,
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
                                     gboolean         include_internals,
 #endif
                                     GtkCallback      callback,
@@ -118,7 +116,7 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass)
 
   container_class->add = gtk_myfixed_add;
   container_class->remove = gtk_myfixed_remove;
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
   container_class->forall = gtk_myfixed_foreach;
 #else
   container_class->foreach = gtk_myfixed_foreach;
@@ -508,7 +506,7 @@ gtk_myfixed_remove (GtkContainer *container,
 
 static void
 gtk_myfixed_foreach (GtkContainer *container,
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
                   gboolean      include_internals,
 #endif
                   GtkCallback   callback,