HACK: Add PLATFORM_MACOS as an option

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

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index 59fb4736457184d2c9e5535c082504139f3e5b9e..e1407bad00fcb1a20283e5fa4202d9327d123103 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -23,9 +23,14 @@ class wxMenu : public wxEvtHandler
 {
 public:
     %pythonAppend wxMenu         "self._setOORInfo(self)"
+    %typemap(out) wxMenu*;    // turn off this typemap
+
     wxMenu(const wxString& title = wxPyEmptyString, long style = 0);
 
+    // Turn it back on again
+    %typemap(out) wxMenu* { $result = wxPyMake_wxObject($1, $owner); }
 
+    
     // append any kind of item (normal/check/radio/separator)
     wxMenuItem* Append(int id,
                        const wxString& text,
@@ -211,8 +216,12 @@ class wxMenuBar : public wxWindow
 {
 public:
     %pythonAppend wxMenuBar         "self._setOORInfo(self)"
+    %typemap(out) wxMenuBar*;    // turn off this typemap
+
     wxMenuBar(long style = 0);
 
+    // Turn it back on again
+    %typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1, $owner); }
 
     // append a menu to the end of menubar, return True if ok
     virtual bool Append(wxMenu *menu, const wxString& title);
@@ -240,7 +249,7 @@ public:
     virtual void EnableTop(size_t pos, bool enable);
 
     // is the menu enabled?
-    virtual bool IsEnabledTop(size_t WXUNUSED(pos)) const { return True; }
+    virtual bool IsEnabledTop(size_t WXUNUSED(pos)) const { return true; }
 
     // get or change the label of the menu at given position
     virtual void SetLabelTop(size_t pos, const wxString& label);
@@ -336,10 +345,10 @@ public:
     wxMenu *GetSubMenu() const;
 
     // state
-    virtual void Enable(bool enable = True);
+    virtual void Enable(bool enable = true);
     virtual bool IsEnabled() const;
 
-    virtual void Check(bool check = True);
+    virtual void Check(bool check = true);
     virtual bool IsChecked() const;
     void Toggle();
 
@@ -375,7 +384,7 @@ public:
     bool IsOwnerDrawn();
 
     // switch on/off owner-drawing the item
-    void SetOwnerDrawn(bool ownerDrawn = True);
+    void SetOwnerDrawn(bool ownerDrawn = true);
     void ResetOwnerDrawn();
 #else
     // just to keep the global  renamers in sync