Applied patch [ 597398 ] Generic MDI, wxNotebook based.

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 4f670803ec68ad1e26f1179a51064ecbcbf9ab84..ee22d137b9ea1505fddc30c812e8b0e3f0da2fdb 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -80,11 +80,16 @@ 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;
@@ -99,6 +104,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)
 };