derive wxComboBox from wxItemContainer (via wxComboBoxBase) in wxGTK (patch 802882)

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index f36c816d2a5e724cfc0ff82fb0761dd6142c67c3..f482d01644315675b1a52fb72dff2663b909765e 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(NO_GCC_PRAGMA)
     #pragma interface "menu.h"
 #endif
 
@@ -80,17 +80,6 @@ public:
 
     // TODO: virtual void SetTitle(const wxString& title);
 
-    // compatibility only
-#if wxUSE_MENU_CALLBACK
-    wxMenu(const wxString& title, const wxFunction func)
-        : wxMenuBase(title)
-    {
-        Init();
-
-        Callback(func);
-    }
-#endif // WXWIN_COMPATIBILITY_2
-
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
 
@@ -107,6 +96,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)
 };