don't leave two conscutive separators after "moving" a standard menu item to the...

[wxWidgets.git] / include / wx / gtk / win_gtk.h

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index adb100078bd07c4af7f207d983227e07215ceeac..2afb5ddfb5b4abab51cef2e9e04f4fea8c46eed7 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -1,6 +1,6 @@
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.h
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.h

-// Purpose:     wxWindows's GTK base widget = GtkPizza
+// Purpose:     wxWidgets's GTK base widget = GtkPizza

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling


@@ -11,17 +11,18 @@
 #ifndef __GTK_PIZZA_H__
 #define __GTK_PIZZA_H__
 
 #ifndef __GTK_PIZZA_H__
 #define __GTK_PIZZA_H__
 

+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+

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

+#include <gdk/gdkx.h>

 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
 #ifndef __WXGTK20__
 #include <gtk/gtkfeatures.h>
 #endif
 
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
 #ifndef __WXGTK20__
 #include <gtk/gtkfeatures.h>
 #endif
 

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-

 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
 #define GTK_PIZZA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass)
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
 #define GTK_PIZZA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass)
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())


@@ -81,7 +82,7 @@ struct _GtkPizzaClass
                                     GtkAdjustment  *vadjustment);
 };
 
                                     GtkAdjustment  *vadjustment);
 };
 

-guint      gtk_pizza_get_type        (void);
+GtkType    gtk_pizza_get_type        (void);

 GtkWidget* gtk_pizza_new             (void);
 
 void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
 GtkWidget* gtk_pizza_new             (void);
 
 void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,