Make wxMDIParentFrame a regular top level window

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index caa919c05d43386145464a878efcc46b75802cff..afc85c0a0c0a6d81bfff88c0d6f5be4f05259713 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -10,7 +10,7 @@
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "menu.h"
 #endif
 
@@ -80,6 +80,8 @@ public:
 
     // TODO: virtual void SetTitle(const wxString& title);
 
+    // compatibility only
+#if wxUSE_MENU_CALLBACK
     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {
@@ -87,6 +89,7 @@ public:
 
         Callback(func);
     }
+#endif // WXWIN_COMPATIBILITY_2
 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
@@ -104,6 +107,10 @@ private:
     // 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)
 };