bitwise vs. logical operator

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

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index 070d88a40777735e825e45b292ec01ac5da4d137..1bbb3a56e403fc8a81a0efce67a41f6f76a31ee6 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -366,6 +366,9 @@ public:
 
 class wxMenuItem : public wxObject {
 public:
 
 class wxMenuItem : public wxObject {
 public:

+    // turn off this typemap
+    %typemap(out) wxMenuItem*;    
+

     wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_ANY,
                const wxString& text = wxPyEmptyString,
                const wxString& help = wxPyEmptyString,
     wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_ANY,
                const wxString& text = wxPyEmptyString,
                const wxString& help = wxPyEmptyString,


@@ -373,6 +376,10 @@ public:
                wxMenu* subMenu = NULL);
     ~wxMenuItem();
 
                wxMenu* subMenu = NULL);
     ~wxMenuItem();
 

+    // Turn it back on again
+    %typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); }
+
+    

     // the menu we're in
     wxMenu *GetMenu() const;
     void SetMenu(wxMenu* menu);
     // the menu we're in
     wxMenu *GetMenu() const;
     void SetMenu(wxMenu* menu);