X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/949853a49c6a379d5673632fac3e275cc5757d9d..e422162882bf4c5ae743fd618864e97206765fca:/wxPython/src/windows2.i diff --git a/wxPython/src/windows2.i b/wxPython/src/windows2.i index 911a0c1905..9010f87e47 100644 --- a/wxPython/src/windows2.i +++ b/wxPython/src/windows2.i @@ -27,6 +27,19 @@ //---------------------------------------------------------------------- +%{ + // Put some wx default wxChar* values into wxStrings. + DECLARE_DEF_STRING(NOTEBOOK_NAME); + DECLARE_DEF_STRING(PanelNameStr); + DECLARE_DEF_STRING(ControlNameStr); + + static const wxChar* wxSplitterNameStr = wxT("splitter"); + DECLARE_DEF_STRING(SplitterNameStr); + static const wxString wxPyEmptyString(wxT("")); +%} + +//---------------------------------------------------------------------- + %include typemaps.i %include my_typemaps.i @@ -69,7 +82,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - char* name = "notebook"); + const wxString& name = wxPyNOTEBOOK_NAME); %name(wxPreNotebook)wxNotebook(); bool Create(wxWindow *parent, @@ -77,7 +90,10 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - char* name = "notebook"); + const wxString& name = wxPyNOTEBOOK_NAME); + + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreNotebook:val._setOORInfo(val)" int GetPageCount(); int SetSelection(int nPage); @@ -143,7 +159,7 @@ enum }; -class wxSplitterEvent : public wxCommandEvent { +class wxSplitterEvent : public wxNotifyEvent { public: wxSplitterEvent(wxEventType type = wxEVT_NULL, wxSplitterWindow *splitter = NULL); @@ -164,15 +180,17 @@ public: const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=wxSP_3D|wxCLIP_CHILDREN, - char* name = "splitterWindow"); + const wxString& name = wxPySplitterNameStr); %name(wxPreSplitterWindow)wxSplitterWindow(); bool Create(wxWindow* parent, wxWindowID id, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=wxSP_3D|wxCLIP_CHILDREN, - char* name = "splitterWindow"); + const wxString& name = wxPySplitterNameStr); + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreSplitterWindow:val._setOORInfo(val)" // Gets the only or left/top pane wxWindow *GetWindow1(); @@ -235,6 +253,12 @@ public: void SetMinimumPaneSize(int min); int GetMinimumPaneSize(); + // Resizes subwindows + virtual void SizeWindows(); + + void SetNeedUpdating(bool needUpdating) { m_needUpdating = needUpdating; } + bool GetNeedUpdating() const { return m_needUpdating ; } + }; //--------------------------------------------------------------------------- @@ -257,6 +281,8 @@ public: wxTaskBarIcon(); ~wxTaskBarIcon(); + //%pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + // We still use the magic methods here since that is the way it is documented... %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE)" %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN)" @@ -266,7 +292,7 @@ public: %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK)" %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK)" - bool SetIcon(const wxIcon& icon, const char* tooltip = ""); + bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxPyEmptyString); bool RemoveIcon(void); bool PopupMenu(wxMenu *menu); bool IsIconInstalled(); @@ -274,4 +300,351 @@ public: }; #endif +//--------------------------------------------------------------------------- +//--------------------------------------------------------------------------- +// wxPyWindow derives from wxWindow and adds support for overriding many of +// the virtual methods in Python derived classes. + +// Which of these should be done??? +// AddChild +// Destroy +// DoCaptureMouse +// DoClientToScreen +// DoHitTest +// DoMoveWindow +// DoPopupMenu +// DoReleaseMouse +// DoScreenToClient +// DoSetToolTip +// Enable +// Fit +// GetCharHeight +// GetCharWidth +// GetClientAreaOrigin +// GetDefaultItem +// IsTopLevel +// RemoveChild +// SetBackgroundColour +// SetDefaultItem +// SetFocus +// SetFocusFromKbd +// SetForegroundColour +// SetSizeHints +// SetVirtualSizeHints +// Show + + +%{ // C++ version of Python aware wxWindow +class wxPyWindow : public wxWindow +{ + DECLARE_DYNAMIC_CLASS(wxPyWindow) +public: + wxPyWindow() : wxWindow() {} + wxPyWindow(wxWindow* parent, const wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxPyPanelNameStr) + : wxWindow(parent, id, pos, size, style, name) {} + + + DEC_PYCALLBACK_VOID_INT4(DoMoveWindow); + DEC_PYCALLBACK_VOID_INT5(DoSetSize); + DEC_PYCALLBACK_VOID_INTINT(DoSetClientSize); + DEC_PYCALLBACK_VOID_INTINT(DoSetVirtualSize); + + DEC_PYCALLBACK_VOID_INTPINTP_const(DoGetSize); + DEC_PYCALLBACK_VOID_INTPINTP_const(DoGetClientSize); + DEC_PYCALLBACK_VOID_INTPINTP_const(DoGetPosition); + + DEC_PYCALLBACK_SIZE_const(DoGetVirtualSize); + DEC_PYCALLBACK_SIZE_const(DoGetBestSize); + + DEC_PYCALLBACK__(InitDialog); + DEC_PYCALLBACK_BOOL_(TransferDataFromWindow); + DEC_PYCALLBACK_BOOL_(TransferDataToWindow); + DEC_PYCALLBACK_BOOL_(Validate); + + DEC_PYCALLBACK_BOOL_const(AcceptsFocus); + DEC_PYCALLBACK_BOOL_const(AcceptsFocusFromKeyboard); + DEC_PYCALLBACK_SIZE_const(GetMaxSize); + + PYPRIVATE; +}; + +IMPLEMENT_DYNAMIC_CLASS(wxPyWindow, wxWindow); + +IMP_PYCALLBACK_VOID_INT4(wxPyWindow, wxWindow, DoMoveWindow); +IMP_PYCALLBACK_VOID_INT5(wxPyWindow, wxWindow, DoSetSize); +IMP_PYCALLBACK_VOID_INTINT(wxPyWindow, wxWindow, DoSetClientSize); +IMP_PYCALLBACK_VOID_INTINT(wxPyWindow, wxWindow, DoSetVirtualSize); + +IMP_PYCALLBACK_VOID_INTPINTP_const(wxPyWindow, wxWindow, DoGetSize); +IMP_PYCALLBACK_VOID_INTPINTP_const(wxPyWindow, wxWindow, DoGetClientSize); +IMP_PYCALLBACK_VOID_INTPINTP_const(wxPyWindow, wxWindow, DoGetPosition); + +IMP_PYCALLBACK_SIZE_const(wxPyWindow, wxWindow, DoGetVirtualSize); +IMP_PYCALLBACK_SIZE_const(wxPyWindow, wxWindow, DoGetBestSize); + +IMP_PYCALLBACK__(wxPyWindow, wxWindow, InitDialog); +IMP_PYCALLBACK_BOOL_(wxPyWindow, wxWindow, TransferDataFromWindow); +IMP_PYCALLBACK_BOOL_(wxPyWindow, wxWindow, TransferDataToWindow); +IMP_PYCALLBACK_BOOL_(wxPyWindow, wxWindow, Validate); + +IMP_PYCALLBACK_BOOL_const(wxPyWindow, wxWindow, AcceptsFocus); +IMP_PYCALLBACK_BOOL_const(wxPyWindow, wxWindow, AcceptsFocusFromKeyboard); +IMP_PYCALLBACK_SIZE_const(wxPyWindow, wxWindow, GetMaxSize); + +%} + +// And now the one for SWIG to see +class wxPyWindow : public wxWindow +{ +public: + wxPyWindow(wxWindow* parent, const wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxPyPanelNameStr); + + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyWindow)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + + + void base_DoMoveWindow(int x, int y, int width, int height); + void base_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 base_DoGetSize( int *OUTPUT, int *OUTPUT ) const; + void base_DoGetClientSize( int *OUTPUT, int *OUTPUT ) const; + void base_DoGetPosition( int *OUTPUT, int *OUTPUT ) const; + + 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; +} + +//--------------------------------------------------------------------------- +// Do the same thing for wxControl + + +%{ // C++ version of Python aware wxControl +class wxPyControl : public wxControl +{ + DECLARE_DYNAMIC_CLASS(wxPyControl) +public: + wxPyControl() : wxControl() {} + wxPyControl(wxWindow* parent, const wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator=wxDefaultValidator, + const wxString& name = wxPyControlNameStr) + : wxControl(parent, id, pos, size, style, validator, name) {} + + + DEC_PYCALLBACK_VOID_INT4(DoMoveWindow); + DEC_PYCALLBACK_VOID_INT5(DoSetSize); + DEC_PYCALLBACK_VOID_INTINT(DoSetClientSize); + DEC_PYCALLBACK_VOID_INTINT(DoSetVirtualSize); + + DEC_PYCALLBACK_VOID_INTPINTP_const(DoGetSize); + DEC_PYCALLBACK_VOID_INTPINTP_const(DoGetClientSize); + DEC_PYCALLBACK_VOID_INTPINTP_const(DoGetPosition); + + DEC_PYCALLBACK_SIZE_const(DoGetVirtualSize); + DEC_PYCALLBACK_SIZE_const(DoGetBestSize); + + DEC_PYCALLBACK__(InitDialog); + DEC_PYCALLBACK_BOOL_(TransferDataFromWindow); + DEC_PYCALLBACK_BOOL_(TransferDataToWindow); + DEC_PYCALLBACK_BOOL_(Validate); + + DEC_PYCALLBACK_BOOL_const(AcceptsFocus); + DEC_PYCALLBACK_BOOL_const(AcceptsFocusFromKeyboard); + DEC_PYCALLBACK_SIZE_const(GetMaxSize); + + PYPRIVATE; +}; + +IMPLEMENT_DYNAMIC_CLASS(wxPyControl, wxControl); + +IMP_PYCALLBACK_VOID_INT4(wxPyControl, wxControl, DoMoveWindow); +IMP_PYCALLBACK_VOID_INT5(wxPyControl, wxControl, DoSetSize); +IMP_PYCALLBACK_VOID_INTINT(wxPyControl, wxControl, DoSetClientSize); +IMP_PYCALLBACK_VOID_INTINT(wxPyControl, wxControl, DoSetVirtualSize); + +IMP_PYCALLBACK_VOID_INTPINTP_const(wxPyControl, wxControl, DoGetSize); +IMP_PYCALLBACK_VOID_INTPINTP_const(wxPyControl, wxControl, DoGetClientSize); +IMP_PYCALLBACK_VOID_INTPINTP_const(wxPyControl, wxControl, DoGetPosition); + +IMP_PYCALLBACK_SIZE_const(wxPyControl, wxControl, DoGetVirtualSize); +IMP_PYCALLBACK_SIZE_const(wxPyControl, wxControl, DoGetBestSize); + +IMP_PYCALLBACK__(wxPyControl, wxControl, InitDialog); +IMP_PYCALLBACK_BOOL_(wxPyControl, wxControl, TransferDataFromWindow); +IMP_PYCALLBACK_BOOL_(wxPyControl, wxControl, TransferDataToWindow); +IMP_PYCALLBACK_BOOL_(wxPyControl, wxControl, Validate); + +IMP_PYCALLBACK_BOOL_const(wxPyControl, wxControl, AcceptsFocus); +IMP_PYCALLBACK_BOOL_const(wxPyControl, wxControl, AcceptsFocusFromKeyboard); +IMP_PYCALLBACK_SIZE_const(wxPyControl, wxControl, GetMaxSize); + +%} + +// And now the one for SWIG to see +class wxPyControl : public wxControl +{ +public: + wxPyControl(wxWindow* parent, const wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator=wxDefaultValidator, + const wxString& name = wxPyControlNameStr); + + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyControl)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + + + void base_DoMoveWindow(int x, int y, int width, int height); + void base_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 base_DoGetSize( int *OUTPUT, int *OUTPUT ) const; + void base_DoGetClientSize( int *OUTPUT, int *OUTPUT ) const; + void base_DoGetPosition( int *OUTPUT, int *OUTPUT ) const; + + 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; +} + +//--------------------------------------------------------------------------- +// and for wxPanel + +%{ // C++ version of Python aware wxPanel +class wxPyPanel : public wxPanel +{ + DECLARE_DYNAMIC_CLASS(wxPyPanel) +public: + wxPyPanel() : wxPanel() {} + wxPyPanel(wxWindow* parent, const wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxPyPanelNameStr) + : wxPanel(parent, id, pos, size, style, name) {} + + + DEC_PYCALLBACK_VOID_INT4(DoMoveWindow); + DEC_PYCALLBACK_VOID_INT5(DoSetSize); + DEC_PYCALLBACK_VOID_INTINT(DoSetClientSize); + DEC_PYCALLBACK_VOID_INTINT(DoSetVirtualSize); + + DEC_PYCALLBACK_VOID_INTPINTP_const(DoGetSize); + DEC_PYCALLBACK_VOID_INTPINTP_const(DoGetClientSize); + DEC_PYCALLBACK_VOID_INTPINTP_const(DoGetPosition); + + DEC_PYCALLBACK_SIZE_const(DoGetVirtualSize); + DEC_PYCALLBACK_SIZE_const(DoGetBestSize); + + DEC_PYCALLBACK__(InitDialog); + DEC_PYCALLBACK_BOOL_(TransferDataFromWindow); + DEC_PYCALLBACK_BOOL_(TransferDataToWindow); + DEC_PYCALLBACK_BOOL_(Validate); + + DEC_PYCALLBACK_BOOL_const(AcceptsFocus); + DEC_PYCALLBACK_BOOL_const(AcceptsFocusFromKeyboard); + DEC_PYCALLBACK_SIZE_const(GetMaxSize); + + PYPRIVATE; +}; + +IMPLEMENT_DYNAMIC_CLASS(wxPyPanel, wxPanel); + +IMP_PYCALLBACK_VOID_INT4(wxPyPanel, wxPanel, DoMoveWindow); +IMP_PYCALLBACK_VOID_INT5(wxPyPanel, wxPanel, DoSetSize); +IMP_PYCALLBACK_VOID_INTINT(wxPyPanel, wxPanel, DoSetClientSize); +IMP_PYCALLBACK_VOID_INTINT(wxPyPanel, wxPanel, DoSetVirtualSize); + +IMP_PYCALLBACK_VOID_INTPINTP_const(wxPyPanel, wxPanel, DoGetSize); +IMP_PYCALLBACK_VOID_INTPINTP_const(wxPyPanel, wxPanel, DoGetClientSize); +IMP_PYCALLBACK_VOID_INTPINTP_const(wxPyPanel, wxPanel, DoGetPosition); + +IMP_PYCALLBACK_SIZE_const(wxPyPanel, wxPanel, DoGetVirtualSize); +IMP_PYCALLBACK_SIZE_const(wxPyPanel, wxPanel, DoGetBestSize); + +IMP_PYCALLBACK__(wxPyPanel, wxPanel, InitDialog); +IMP_PYCALLBACK_BOOL_(wxPyPanel, wxPanel, TransferDataFromWindow); +IMP_PYCALLBACK_BOOL_(wxPyPanel, wxPanel, TransferDataToWindow); +IMP_PYCALLBACK_BOOL_(wxPyPanel, wxPanel, Validate); + +IMP_PYCALLBACK_BOOL_const(wxPyPanel, wxPanel, AcceptsFocus); +IMP_PYCALLBACK_BOOL_const(wxPyPanel, wxPanel, AcceptsFocusFromKeyboard); +IMP_PYCALLBACK_SIZE_const(wxPyPanel, wxPanel, GetMaxSize); + +%} + +// And now the one for SWIG to see +class wxPyPanel : public wxPanel +{ +public: + wxPyPanel(wxWindow* parent, const wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxPyPanelNameStr); + + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyPanel)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + + + void base_DoMoveWindow(int x, int y, int width, int height); + void base_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 base_DoGetSize( int *OUTPUT, int *OUTPUT ) const; + void base_DoGetClientSize( int *OUTPUT, int *OUTPUT ) const; + void base_DoGetPosition( int *OUTPUT, int *OUTPUT ) const; + + 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; +} + + //---------------------------------------------------------------------------