Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wizard classes don't take resource parameter anymore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-04-12 00:52:43 +00:00
parent c4b330b35d
commit 6493d270f2
1 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
wxPython/src/wizard.i
View File

@@ -95,20 +95,11 @@ public:
// // that no other parameters are needed because the wizard will resize and // // that no other parameters are needed because the wizard will resize and
// // reposition the page anyhow // // reposition the page anyhow
// wxWizardPage(wxWizard *parent, // wxWizardPage(wxWizard *parent,
// const wxBitmap& bitmap = wxNullBitmap, // const wxBitmap& bitmap = wxNullBitmap);
// const char* resource = NULL);
// %RenameCtor(PreWizardPage, wxWizardPage()); // %RenameCtor(PreWizardPage, wxWizardPage());
%extend {
bool Create(wxWizard *parent, bool Create(wxWizard *parent,
const wxBitmap& bitmap = wxNullBitmap, const wxBitmap& bitmap = wxNullBitmap);
const wxString& resource = wxPyEmptyString) {
const wxChar* res = NULL;
if (resource.length())
res = (const wxChar*)resource.c_str();
return self->Create(parent, bitmap, res);
}
}
// these functions are used by the wizard to show another page when the // these functions are used by the wizard to show another page when the
@@ -135,9 +126,8 @@ class wxPyWizardPage : public wxWizardPage {
public: public:
wxPyWizardPage() : wxWizardPage() {} wxPyWizardPage() : wxWizardPage() {}
wxPyWizardPage(wxWizard *parent, wxPyWizardPage(wxWizard *parent,
const wxBitmap& bitmap = wxNullBitmap, const wxBitmap& bitmap = wxNullBitmap)
const wxChar* resource = NULL) : wxWizardPage(parent, bitmap) {}
: wxWizardPage(parent, bitmap, resource) {}
DEC_PYCALLBACK_WIZPG__pure(GetPrev); DEC_PYCALLBACK_WIZPG__pure(GetPrev);
DEC_PYCALLBACK_WIZPG__pure(GetNext); DEC_PYCALLBACK_WIZPG__pure(GetNext);
@@ -218,32 +208,16 @@ public:
// of the default one for this wizard (should be of the same size). Notice // of the default one for this wizard (should be of the same size). Notice
// that no other parameters are needed because the wizard will resize and // that no other parameters are needed because the wizard will resize and
// reposition the page anyhow // reposition the page anyhow
%extend {
wxPyWizardPage(wxWizard *parent, wxPyWizardPage(wxWizard *parent,
const wxBitmap* bitmap = &wxNullBitmap, const wxBitmap& bitmap = wxNullBitmap);
const wxString* resource = &wxPyEmptyString) {
const wxChar* res = NULL;
if (resource->length())
res = (const wxChar*)resource->c_str();
return new wxPyWizardPage(parent, *bitmap, res);
}
}
%RenameCtor(PrePyWizardPage, wxPyWizardPage()); %RenameCtor(PrePyWizardPage, wxPyWizardPage());
// Turn it back on again // Turn it back on again
%typemap(out) wxPyWizardPage* { $result = wxPyMake_wxObject($1, $owner); } %typemap(out) wxPyWizardPage* { $result = wxPyMake_wxObject($1, $owner); }
%extend {
bool Create(wxWizard *parent, bool Create(wxWizard *parent,
const wxBitmap& bitmap = wxNullBitmap, const wxBitmap& bitmap = wxNullBitmap);
const wxString& resource = wxPyEmptyString) {
const wxChar* res = NULL;
if (resource.length())
res = (const wxChar*)resource.c_str();
return self->Create(parent, bitmap, res);
}
}
void _setCallbackInfo(PyObject* self, PyObject* _class); void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -328,15 +302,13 @@ public:
wxWizardPageSimple(wxWizard *parent, wxWizardPageSimple(wxWizard *parent,
wxWizardPage *prev = NULL, wxWizardPage *prev = NULL,
wxWizardPage *next = NULL, wxWizardPage *next = NULL,
const wxBitmap& bitmap = wxNullBitmap, const wxBitmap& bitmap = wxNullBitmap);
const wxChar* resource = NULL);
%RenameCtor(PreWizardPageSimple, wxWizardPageSimple()); %RenameCtor(PreWizardPageSimple, wxWizardPageSimple());
bool Create(wxWizard *parent = NULL, bool Create(wxWizard *parent = NULL,
wxWizardPage *prev = NULL, wxWizardPage *prev = NULL,
wxWizardPage *next = NULL, wxWizardPage *next = NULL,
const wxBitmap& bitmap = wxNullBitmap, const wxBitmap& bitmap = wxNullBitmap);
const wxChar* resource = NULL);
// the pointers may be also set later - but before starting the wizard // the pointers may be also set later - but before starting the wizard
void SetPrev(wxWizardPage *prev); void SetPrev(wxWizardPage *prev);