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
This commit is contained in:
Robin Dunn
2004-07-17 22:51:01 +00:00
parent 14885f0910
commit b39c3fa09a
23 changed files with 131 additions and 12 deletions

View File

@@ -29,6 +29,7 @@ class wxPanel : public wxWindow
public:
%pythonAppend wxPanel "self._setOORInfo(self)"
%pythonAppend wxPanel() ""
%typemap(out) wxPanel*; // turn off this typemap
wxPanel(wxWindow* parent,
const wxWindowID id=-1,
@@ -38,6 +39,9 @@ public:
const wxString& name = wxPyPanelNameStr);
%name(PrePanel)wxPanel();
// Turn it back on again
%typemap(out) wxPanel* { $result = wxPyMake_wxObject($1, $owner); }
bool Create(wxWindow* parent,
const wxWindowID id=-1,
const wxPoint& pos = wxDefaultPosition,
@@ -66,6 +70,7 @@ class wxScrolledWindow : public wxPanel
public:
%pythonAppend wxScrolledWindow "self._setOORInfo(self)"
%pythonAppend wxScrolledWindow() ""
%typemap(out) wxScrolledWindow*; // turn off this typemap
wxScrolledWindow(wxWindow* parent,
const wxWindowID id = -1,
@@ -75,6 +80,9 @@ public:
const wxString& name = wxPyPanelNameStr);
%name(PreScrolledWindow)wxScrolledWindow();
// Turn it back on again
%typemap(out) wxScrolledWindow* { $result = wxPyMake_wxObject($1, $owner); }
bool Create(wxWindow* parent,
const wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,