X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a72f4631fe5ab7ebeefdacf8ec9c826ea962133f..5f2502393e042e6e2c871ff94b7ccaf7a78b264d:/wxPython/src/wizard.i diff --git a/wxPython/src/wizard.i b/wxPython/src/wizard.i index 32c7b7cd9a..18677ef176 100644 --- a/wxPython/src/wizard.i +++ b/wxPython/src/wizard.i @@ -32,8 +32,6 @@ or pages." %pythoncode { wx = _core } %pythoncode { __docfilter__ = wx.__DocFilter(globals()) } -%include _wizard_rename.i - MAKE_CONST_WXSTRING_NOSWIG(EmptyString); //---------------------------------------------------------------------- @@ -72,9 +70,12 @@ public: // False otherwise and for EVT_WIZARD_PAGE_CHANGED return True if we came // from the previous page and False if we returned from the next one // (this function doesn't make sense for CANCEL events) - bool GetDirection() const { return m_direction; } + bool GetDirection() const; + + wxWizardPage* GetPage() const; - wxWizardPage* GetPage() const { return m_page; } + %property(Direction, GetDirection, doc="See `GetDirection`"); + %property(Page, GetPage, doc="See `GetPage`"); }; @@ -96,14 +97,14 @@ public: // wxWizardPage(wxWizard *parent, // const wxBitmap& bitmap = wxNullBitmap, // const char* resource = NULL); -// %name(PreWizardPage)wxWizardPage(); +// %RenameCtor(PreWizardPage, wxWizardPage()); %extend { bool Create(wxWizard *parent, const wxBitmap& bitmap = wxNullBitmap, const wxString& resource = wxPyEmptyString) { wxChar* res = NULL; - if (resource.Length()) + if (resource.length()) res = (wxChar*)resource.c_str(); return self->Create(parent, bitmap, res); } @@ -120,13 +121,17 @@ public: // dynamically or to do something even more fancy. It's ok to return // wxNullBitmap from here - the default one will be used then. virtual wxBitmap GetBitmap() const; + + %property(Bitmap, GetBitmap, doc="See `GetBitmap`"); + %property(Next, GetNext, doc="See `GetNext`"); + %property(Prev, GetPrev, doc="See `GetPrev`"); }; %{ // C++ Version of a Python aware class class wxPyWizardPage : public wxWizardPage { - DECLARE_ABSTRACT_CLASS(wxPyWizardPage); + DECLARE_ABSTRACT_CLASS(wxPyWizardPage) public: wxPyWizardPage() : wxWizardPage() {} wxPyWizardPage(wxWizard *parent, @@ -218,13 +223,13 @@ public: const wxBitmap* bitmap = &wxNullBitmap, const wxString* resource = &wxPyEmptyString) { wxChar* res = NULL; - if (resource->Length()) + if (resource->length()) res = (wxChar*)resource->c_str(); return new wxPyWizardPage(parent, *bitmap, res); } } - %name(PrePyWizardPage)wxPyWizardPage(); + %RenameCtor(PrePyWizardPage, wxPyWizardPage()); // Turn it back on again %typemap(out) wxPyWizardPage* { $result = wxPyMake_wxObject($1, $owner); } @@ -234,7 +239,7 @@ public: const wxBitmap& bitmap = wxNullBitmap, const wxString& resource = wxPyEmptyString) { wxChar* res = NULL; - if (resource.Length()) + if (resource.length()) res = (wxChar*)resource.c_str(); return self->Create(parent, bitmap, res); } @@ -242,36 +247,64 @@ public: void _setCallbackInfo(PyObject* self, PyObject* _class); - void base_DoMoveWindow(int x, int y, int width, int height); - void base_DoSetSize(int x, int y, int width, int height, + void DoMoveWindow(int x, int y, int width, int height); + void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - void base_DoSetClientSize(int width, int height); - void base_DoSetVirtualSize( int x, int y ); + void DoSetClientSize(int width, int height); + void DoSetVirtualSize( int x, int y ); DocDeclA( - void, base_DoGetSize( int *OUTPUT, int *OUTPUT ) const, - "base_DoGetSize() -> (width, height)"); + void, DoGetSize( int *OUTPUT, int *OUTPUT ) const, + "DoGetSize() -> (width, height)"); DocDeclA( - void, base_DoGetClientSize( int *OUTPUT, int *OUTPUT ) const, - "base_DoGetClientSize() -> (width, height)"); + void, DoGetClientSize( int *OUTPUT, int *OUTPUT ) const, + "DoGetClientSize() -> (width, height)"); DocDeclA( - void, base_DoGetPosition( int *OUTPUT, int *OUTPUT ) const, - "base_DoGetPosition() -> (x,y)"); - - wxSize base_DoGetVirtualSize() const; - wxSize base_DoGetBestSize() const; - - void base_InitDialog(); - bool base_TransferDataToWindow(); - bool base_TransferDataFromWindow(); - bool base_Validate(); - - bool base_AcceptsFocus() const; - bool base_AcceptsFocusFromKeyboard() const; - wxSize base_GetMaxSize() const; - - void base_AddChild(wxWindow* child); - void base_RemoveChild(wxWindow* child); + void, DoGetPosition( int *OUTPUT, int *OUTPUT ) const, + "DoGetPosition() -> (x,y)"); + + wxSize DoGetVirtualSize() const; + wxSize DoGetBestSize() const; + + void InitDialog(); + bool TransferDataToWindow(); + bool TransferDataFromWindow(); + bool Validate(); + + bool AcceptsFocus() const; + bool AcceptsFocusFromKeyboard() const; + wxSize GetMaxSize() const; + + void AddChild(wxWindow* child); + void RemoveChild(wxWindow* child); + + bool ShouldInheritColours() const; + wxVisualAttributes GetDefaultAttributes(); + + void OnInternalIdle(); + + %MAKE_BASE_FUNC(PyWizardPage, DoMoveWindow); + %MAKE_BASE_FUNC(PyWizardPage, DoSetSize); + %MAKE_BASE_FUNC(PyWizardPage, DoSetClientSize); + %MAKE_BASE_FUNC(PyWizardPage, DoSetVirtualSize); + %MAKE_BASE_FUNC(PyWizardPage, DoGetSize); + %MAKE_BASE_FUNC(PyWizardPage, DoGetClientSize); + %MAKE_BASE_FUNC(PyWizardPage, DoGetPosition); + %MAKE_BASE_FUNC(PyWizardPage, DoGetVirtualSize); + %MAKE_BASE_FUNC(PyWizardPage, DoGetBestSize); + %MAKE_BASE_FUNC(PyWizardPage, InitDialog); + %MAKE_BASE_FUNC(PyWizardPage, TransferDataToWindow); + %MAKE_BASE_FUNC(PyWizardPage, TransferDataFromWindow); + %MAKE_BASE_FUNC(PyWizardPage, Validate); + %MAKE_BASE_FUNC(PyWizardPage, AcceptsFocus); + %MAKE_BASE_FUNC(PyWizardPage, AcceptsFocusFromKeyboard); + %MAKE_BASE_FUNC(PyWizardPage, GetMaxSize); + %MAKE_BASE_FUNC(PyWizardPage, AddChild); + %MAKE_BASE_FUNC(PyWizardPage, RemoveChild); + %MAKE_BASE_FUNC(PyWizardPage, ShouldInheritColours); + %MAKE_BASE_FUNC(PyWizardPage, GetDefaultAttributes); + %MAKE_BASE_FUNC(PyWizardPage, OnInternalIdle); + }; //---------------------------------------------------------------------- @@ -297,7 +330,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 +364,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, @@ -375,7 +408,7 @@ public: virtual void SetBorder(int border); // is the wizard running? - bool IsRunning() const { return m_page != NULL; } + bool IsRunning() const; // show the prev/next page, but call TransferDataFromWindow on the current // page first and return False without changing the page if @@ -384,6 +417,10 @@ public: bool HasNextPage(wxWizardPage* page); bool HasPrevPage(wxWizardPage* page); + + %property(CurrentPage, GetCurrentPage, doc="See `GetCurrentPage`"); + %property(PageAreaSizer, GetPageAreaSizer, doc="See `GetPageAreaSizer`"); + %property(PageSize, GetPageSize, SetPageSize, doc="See `GetPageSize` and `SetPageSize`"); };