X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..b76f0023ae275de2d71ed735a95d2ecb81d4ea74:/include/wx/gtk1/menu.h?ds=sidebyside

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index afc85c0a0c..123f23b86b 100644
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -10,7 +10,7 @@
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "menu.h"
 #endif
 
@@ -48,8 +48,9 @@ public:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title);
 
+#ifndef __WXGTK20__
     GtkAccelGroup   *m_accel;
-    GtkItemFactory  *m_factory;
+#endif
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
@@ -74,23 +75,12 @@ public:
     virtual ~wxMenu();
 
     // implement base class virtuals
-    virtual bool DoAppend(wxMenuItem *item);
-    virtual bool DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem *DoRemove(wxMenuItem *item);
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
 
     // 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;
 
@@ -98,7 +88,6 @@ public:
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
-    GtkItemFactory  *m_factory;
 
 private:
     // common code for all constructors:
@@ -107,9 +96,7 @@ 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;
+	GtkWidget *m_prevRadio;
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };