no message

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index a6db9819305d6dd3024bd99ab6b59edf4aa4317b..3a999cdeffb87bd00c7f79f2c2d27b26a7f64e73 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+/* ///////////////////////////////////////////////////////////////////////////

 // Name:        wx_gtk.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        wx_gtk.h
 // Purpose:
 // Author:      Robert Roebling


@@ -6,9 +6,10 @@
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence

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

 
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/win_gtk.h"

+#include <gtk/gtkfeatures.h>

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


@@ -34,6 +35,9 @@ static void gtk_myfixed_add           (GtkContainer     *container,
 static void gtk_myfixed_remove        (GtkContainer     *container,
                                     GtkWidget        *widget);
 static void gtk_myfixed_foreach       (GtkContainer     *container,
 static void gtk_myfixed_remove        (GtkContainer     *container,
                                     GtkWidget        *widget);
 static void gtk_myfixed_foreach       (GtkContainer     *container,

+#if (GTK_MINOR_VERSION == 1)
+                                    gboolean         include_internals,
+#endif

                                     GtkCallback      callback,
                                     gpointer         callback_data);
 
                                     GtkCallback      callback,
                                     gpointer         callback_data);
 


@@ -88,7 +92,11 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass)
 
   container_class->add = gtk_myfixed_add;
   container_class->remove = gtk_myfixed_remove;
 
   container_class->add = gtk_myfixed_add;
   container_class->remove = gtk_myfixed_remove;

+#if (GTK_MINOR_VERSION == 1)
+  container_class->forall = gtk_myfixed_foreach;
+#else

   container_class->foreach = gtk_myfixed_foreach;
   container_class->foreach = gtk_myfixed_foreach;

+#endif

 }
 
 static void
 }
 
 static void


@@ -454,6 +462,9 @@ gtk_myfixed_remove (GtkContainer *container,
 
 static void
 gtk_myfixed_foreach (GtkContainer *container,
 
 static void
 gtk_myfixed_foreach (GtkContainer *container,

+#if (GTK_MINOR_VERSION == 1)
+                  gboolean      include_internals,
+#endif

                   GtkCallback   callback,
                   gpointer      callback_data)
 {
                   GtkCallback   callback,
                   gpointer      callback_data)
 {