added support for POST method and alternate ports (part of patch 649438)

[wxWidgets.git] / include / wx / gtk1 / menu.h

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index c9d198017e4bb037c89eed66123b882524bfc53a..d2d836ed7e18ee7b7c2fc553722966798b8fceab 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -10,7 +10,7 @@
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "menu.h"
 #endif
 
@@ -45,6 +45,9 @@ public:
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 
+    // common part of Append and Insert
+    bool GtkAppend(wxMenu *menu, const wxString& title);
+
     GtkAccelGroup   *m_accel;
     GtkItemFactory  *m_factory;
     GtkWidget       *m_menubar;
@@ -77,12 +80,6 @@ public:
 
     // TODO: virtual void SetTitle(const wxString& title);
 
-    wxMenu(const wxString& title, const wxFunction func)
-        : wxMenuBase(title)
-    {
-        Callback(func);
-    }
-
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
 
@@ -96,6 +93,13 @@ private:
     // common code for all constructors:
     void Init();
 
+    // common part of Append and Insert
+    bool GtkAppend(wxMenuItem *item);
+
+    // if the last menu item was a radio one, this field contains its path,
+    // otherwise it is empty
+    wxString m_pathLastRadio;
+
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };