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:
@@ -151,6 +151,7 @@ class wxFrame : public wxTopLevelWindow {
|
||||
public:
|
||||
%pythonAppend wxFrame "self._setOORInfo(self)"
|
||||
%pythonAppend wxFrame() ""
|
||||
%typemap(out) wxFrame*; // turn off this typemap
|
||||
|
||||
wxFrame(wxWindow* parent, const wxWindowID id=-1,
|
||||
const wxString& title = wxPyEmptyString,
|
||||
@@ -160,6 +161,10 @@ public:
|
||||
const wxString& name = wxPyFrameNameStr);
|
||||
%name(PreFrame)wxFrame();
|
||||
|
||||
// Turn it back on again
|
||||
%typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, $owner); }
|
||||
|
||||
|
||||
bool Create(wxWindow* parent, const wxWindowID id=-1,
|
||||
const wxString& title = wxPyEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
@@ -265,6 +270,7 @@ class wxDialog : public wxTopLevelWindow {
|
||||
public:
|
||||
%pythonAppend wxDialog "self._setOORInfo(self)"
|
||||
%pythonAppend wxDialog() ""
|
||||
%typemap(out) wxDialog*; // turn off this typemap
|
||||
|
||||
wxDialog(wxWindow* parent,
|
||||
const wxWindowID id=-1,
|
||||
@@ -275,6 +281,9 @@ public:
|
||||
const wxString& name = wxPyDialogNameStr);
|
||||
%name(PreDialog)wxDialog();
|
||||
|
||||
// Turn it back on again
|
||||
%typemap(out) wxDialog* { $result = wxPyMake_wxObject($1, $owner); }
|
||||
|
||||
bool Create(wxWindow* parent,
|
||||
const wxWindowID id=-1,
|
||||
const wxString& title = wxPyEmptyString,
|
||||
|
Reference in New Issue
Block a user