factored out key handling for better integrating with carbon

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index caa919c05d43386145464a878efcc46b75802cff..ee22d137b9ea1505fddc30c812e8b0e3f0da2fdb 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -80,6 +80,8 @@ public:
 
     // TODO: virtual void SetTitle(const wxString& title);
 
 
     // TODO: virtual void SetTitle(const wxString& title);
 

+    // compatibility only
+#if wxUSE_MENU_CALLBACK

     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {
     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {


@@ -87,6 +89,7 @@ public:
 
         Callback(func);
     }
 
         Callback(func);
     }

+#endif // WXWIN_COMPATIBILITY_2

 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;


@@ -104,6 +107,10 @@ private:
     // common part of Append and Insert
     bool GtkAppend(wxMenuItem *item);
 
     // 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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };