Avoid using the OOR typemap in the constructors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-17 22:51:01 +00:00
parent 14885f0910
commit b39c3fa09a
23 changed files with 131 additions and 12 deletions
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -199,6 +199,7 @@ class wxWindow : public wxEvtHandler
 public:
    %pythonAppend wxWindow         "self._setOORInfo(self)"
    %pythonAppend wxWindow()       ""
+    %typemap(out) wxWindow*;    // turn off this typemap

    DocCtorStr(
        wxWindow(wxWindow* parent, const wxWindowID id=-1,
@@ -213,7 +214,10 @@ public:
        "Precreate a Window for 2-phase creation.", "",
        PreWindow);
    
+    // Turn it back on again
+    %typemap(out) wxWindow* { $result = wxPyMake_wxObject($1, $owner); }

+    
    DocDeclStr(
        bool , Create(wxWindow* parent, const wxWindowID id=-1,
                const wxPoint& pos = wxDefaultPosition,