Updated to SWIG 1.3.24 (plus a patch that corrects a bug and adds back
some things that were changed/removed from my patch I submitted to them.) Since it is now possible easily and simply share the SWIG type tables across modules I reverted to always using the stock SWIG runtime instead of my slightly hacked up version of it exported via the wxPython C API. The %name directive is now deprecated so replaced most uses of it with a custom %Rename macro that uses %rename internally. These will evetually need to be replaced with a DocDecl macro when docstrings are added. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -96,7 +96,7 @@ public:
|
||||
// wxWizardPage(wxWizard *parent,
|
||||
// const wxBitmap& bitmap = wxNullBitmap,
|
||||
// const char* resource = NULL);
|
||||
// %name(PreWizardPage)wxWizardPage();
|
||||
// %RenameCtor(PreWizardPage, wxWizardPage());
|
||||
|
||||
%extend {
|
||||
bool Create(wxWizard *parent,
|
||||
@@ -224,7 +224,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
%name(PrePyWizardPage)wxPyWizardPage();
|
||||
%RenameCtor(PrePyWizardPage, wxPyWizardPage());
|
||||
|
||||
// Turn it back on again
|
||||
%typemap(out) wxPyWizardPage* { $result = wxPyMake_wxObject($1, $owner); }
|
||||
@@ -297,7 +297,7 @@ public:
|
||||
wxWizardPage *next = NULL,
|
||||
const wxBitmap& bitmap = wxNullBitmap,
|
||||
const wxChar* resource = NULL);
|
||||
%name(PreWizardPageSimple)wxWizardPageSimple();
|
||||
%RenameCtor(PreWizardPageSimple, wxWizardPageSimple());
|
||||
|
||||
bool Create(wxWizard *parent = NULL,
|
||||
wxWizardPage *prev = NULL,
|
||||
@@ -331,7 +331,7 @@ public:
|
||||
const wxBitmap& bitmap = wxNullBitmap,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
long style = wxDEFAULT_DIALOG_STYLE);
|
||||
%name(PreWizard)wxWizard();
|
||||
%RenameCtor(PreWizard, wxWizard());
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
int id = -1,
|
||||
|
Reference in New Issue
Block a user