Allow for Cmd-click on wxMac

[wxWidgets.git] / wxPython / src / _menu.i

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index a26d2103fdf148afa45acb87b04e04d41e5a4b8d..59fb4736457184d2c9e5535c082504139f3e5b9e 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -17,103 +17,105 @@
 %newgroup
 
 
+MustHaveApp(wxMenu);
+
 class wxMenu : public wxEvtHandler
 {
 public:
-    %addtofunc wxMenu         "self._setOORInfo(self)"
+    %pythonAppend wxMenu         "self._setOORInfo(self)"
     wxMenu(const wxString& title = wxPyEmptyString, long style = 0);
 
 
     // append any kind of item (normal/check/radio/separator)
-    void Append(int id,
-                const wxString& text,
-                const wxString& help = wxPyEmptyString,
-                wxItemKind kind = wxITEM_NORMAL);
+    wxMenuItem* Append(int id,
+                       const wxString& text,
+                       const wxString& help = wxPyEmptyString,
+                       wxItemKind kind = wxITEM_NORMAL);
 
     // append a separator to the menu
-    void AppendSeparator();
+    wxMenuItem* AppendSeparator();
 
     // append a check item
-    void AppendCheckItem(int id,
-                         const wxString& text,
-                         const wxString& help = wxPyEmptyString);
+    wxMenuItem* AppendCheckItem(int id,
+                                const wxString& text,
+                                const wxString& help = wxPyEmptyString);
 
     // append a radio item
-    void AppendRadioItem(int id,
-                         const wxString& text,
-                         const wxString& help = wxPyEmptyString);
+    wxMenuItem* AppendRadioItem(int id,
+                                const wxString& text,
+                                const wxString& help = wxPyEmptyString);
     // append a submenu
-    %name(AppendMenu)void Append(int id,
-                                 const wxString& text,
-                                 wxMenu *submenu,
-                                 const wxString& help = wxPyEmptyString);
+    %name(AppendMenu) wxMenuItem* Append(int id,
+                                         const wxString& text,
+                                         wxMenu *submenu,
+                                         const wxString& help = wxPyEmptyString);
 
     // the most generic form of Append() - append anything
-    %name(AppendItem) void Append(wxMenuItem *item);
+    %name(AppendItem) wxMenuItem* Append(wxMenuItem *item);
 
     // insert a break in the menu (only works when appending the items, not
     // inserting them)
     virtual void Break();
 
     // insert an item before given position
-    %name(InsertItem) bool Insert(size_t pos, wxMenuItem *item);
+    %name(InsertItem) wxMenuItem* Insert(size_t pos, wxMenuItem *item);
 
     // insert an item before given position
-    void Insert(size_t pos,
-                int id,
-                const wxString& text,
-                const wxString& help = wxPyEmptyString,
-                wxItemKind kind = wxITEM_NORMAL);
+    wxMenuItem* Insert(size_t pos,
+                       int id,
+                       const wxString& text,
+                       const wxString& help = wxPyEmptyString,
+                       wxItemKind kind = wxITEM_NORMAL);
 
     // insert a separator
-    void InsertSeparator(size_t pos);
+    wxMenuItem* InsertSeparator(size_t pos);
 
     // insert a check item
-    void InsertCheckItem(size_t pos,
-                         int id,
-                         const wxString& text,
-                         const wxString& help = wxPyEmptyString);
+    wxMenuItem* InsertCheckItem(size_t pos,
+                                int id,
+                                const wxString& text,
+                                const wxString& help = wxPyEmptyString);
 
     // insert a radio item
-    void InsertRadioItem(size_t pos,
-                         int id,
-                         const wxString& text,
-                         const wxString& help = wxPyEmptyString);
+    wxMenuItem* InsertRadioItem(size_t pos,
+                                int id,
+                                const wxString& text,
+                                const wxString& help = wxPyEmptyString);
 
     // insert a submenu
-    %name(InsertMenu) void Insert(size_t pos,
-                                  int id,
-                                  const wxString& text,
-                                  wxMenu *submenu,
-                                  const wxString& help = wxPyEmptyString);
+    %name(InsertMenu) wxMenuItem* Insert(size_t pos,
+                                         int id,
+                                         const wxString& text,
+                                         wxMenu *submenu,
+                                         const wxString& help = wxPyEmptyString);
 
     // prepend an item to the menu
-    %name(PrependItem)void Prepend(wxMenuItem *item);
+    %name(PrependItem) wxMenuItem* Prepend(wxMenuItem *item);
 
     // prepend any item to the menu
-    void Prepend(int id,
-                 const wxString& text,
-                 const wxString& help = wxPyEmptyString,
-                 wxItemKind kind = wxITEM_NORMAL);
+    wxMenuItem* Prepend(int id,
+                        const wxString& text,
+                        const wxString& help = wxPyEmptyString,
+                        wxItemKind kind = wxITEM_NORMAL);
 
     // prepend a separator
-    void PrependSeparator();
+    wxMenuItem*  PrependSeparator();
 
     // prepend a check item
-    void PrependCheckItem(int id,
-                          const wxString& text,
-                          const wxString& help = wxPyEmptyString);
+    wxMenuItem* PrependCheckItem(int id,
+                                 const wxString& text,
+                                 const wxString& help = wxPyEmptyString);
 
     // prepend a radio item
-    void PrependRadioItem(int id,
-                          const wxString& text,
-                          const wxString& help = wxPyEmptyString);
+    wxMenuItem*  PrependRadioItem(int id,
+                                  const wxString& text,
+                                  const wxString& help = wxPyEmptyString);
 
     // prepend a submenu
-    %name(PrependMenu)void Prepend(int id,
-                                   const wxString& text,
-                                   wxMenu *submenu,
-                                   const wxString& help = wxPyEmptyString);
+    %name(PrependMenu) wxMenuItem* Prepend(int id,
+                                           const wxString& text,
+                                           wxMenu *submenu,
+                                           const wxString& help = wxPyEmptyString);
 
     // detach an item from the menu, but don't delete it so that it can be
     // added back later (but if it's not, the caller is responsible for
@@ -203,10 +205,12 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
+MustHaveApp(wxMenuBar);
+
 class wxMenuBar : public wxWindow
 {
 public:
-    %addtofunc wxMenuBar         "self._setOORInfo(self)"
+    %pythonAppend wxMenuBar         "self._setOORInfo(self)"
     wxMenuBar(long style = 0);
 
 
@@ -292,7 +296,7 @@ public:
 
 class wxMenuItem : public wxObject {
 public:
-    wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
+    wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_ANY,
                const wxString& text = wxPyEmptyString,
                const wxString& help = wxPyEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
@@ -322,6 +326,7 @@ public:
 
     // what kind of menu item we are
     wxItemKind GetKind() const;
+    void SetKind(wxItemKind kind);
 
     virtual void SetCheckable(bool checkable);
     bool IsCheckable() const;