X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8fac2b60de05657e9f3b0b0b511f57a77eb388a..51b83b37560a05eb688e8ed584bca47b0d1f968e:/wxPython/src/wizard.i diff --git a/wxPython/src/wizard.i b/wxPython/src/wizard.i index 03862c5cc9..e2add09da9 100644 --- a/wxPython/src/wizard.i +++ b/wxPython/src/wizard.i @@ -14,7 +14,8 @@ "`Wizard` is a dialog class that guides the user through a sequence of steps, or pages." %enddef -%module(docstring=DOCSTRING) wizard + +%module(package="wx", docstring=DOCSTRING) wizard %{ #include "wx/wxPython/wxPython.h" @@ -64,7 +65,7 @@ class wxWizardEvent : public wxNotifyEvent public: wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1, - bool direction = True, + bool direction = true, wxWizardPage* page = NULL); // for EVT_WIZARD_PAGE_CHANGING, return True if we're going forward or @@ -84,6 +85,7 @@ public: // // Other than GetNext/Prev() functions, wxWizardPage is just a panel and may be // used as such (i.e. controls may be placed directly on it &c). +MustHaveApp(wxWizardPage); class wxWizardPage : public wxPanel { public: @@ -94,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, @@ -198,11 +200,14 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWizardPage, wxWizardPage, RemoveChild); +MustHaveApp(wxPyWizardPage); + class wxPyWizardPage : public wxWizardPage { public: %pythonAppend wxPyWizardPage "self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)" %pythonAppend wxPyWizardPage() "" + %typemap(out) wxPyWizardPage*; // turn off this typemap // ctor accepts an optional bitmap which will be used for this page instead // of the default one for this wizard (should be of the same size). Notice @@ -219,7 +224,10 @@ public: } } - %name(PrePyWizardPage)wxPyWizardPage(); + %RenameCtor(PrePyWizardPage, wxPyWizardPage()); + + // Turn it back on again + %typemap(out) wxPyWizardPage* { $result = wxPyMake_wxObject($1, $owner); } %extend { bool Create(wxWizard *parent, @@ -275,6 +283,7 @@ public: // OTOH, it is also possible to dynamicly decide which page to return (i.e. // depending on the user's choices) as the wizard sample shows - in order to do // this, you must derive from wxWizardPage directly. +MustHaveApp(wxWizardPageSimple); class wxWizardPageSimple : public wxWizardPage { public: @@ -288,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, @@ -307,6 +316,8 @@ public: //---------------------------------------------------------------------- +MustHaveApp(wxWizard); + class wxWizard : public wxDialog { public: @@ -320,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, @@ -369,7 +380,7 @@ public: // show the prev/next page, but call TransferDataFromWindow on the current // page first and return False without changing the page if // TransferDataFromWindow() returns False - otherwise, returns True - bool ShowPage(wxWizardPage *page, bool goingForward = True); + bool ShowPage(wxWizardPage *page, bool goingForward = true); bool HasNextPage(wxWizardPage* page); bool HasPrevPage(wxWizardPage* page);