Added wxPyWindow and wxPyControl which are just like their wx
counterparts except they allow some of the more common C++ virtual methods to be overridden in Python derived classes. Changed wxGenButton to derive from wxPyControl. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
@@ -31,6 +31,7 @@
|
||||
// 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);
|
||||
@@ -304,69 +305,241 @@ public:
|
||||
// wxPyWindow derives from wxWindow and adds support for overriding many of
|
||||
// the virtual methods in Python derived classes.
|
||||
|
||||
// Do wxPyControl too.
|
||||
|
||||
// %{
|
||||
// class wxPyWindow : public wxWindow
|
||||
// {
|
||||
// DECLARE_DYNAMIC_CLASS(wxPyWindow)
|
||||
// public:
|
||||
// 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) {}
|
||||
|
||||
|
||||
// // Which of these should be done???
|
||||
// DoSetSize
|
||||
// DoGetSize
|
||||
// DoSetClientSize
|
||||
// DoGetClientSize
|
||||
// DoGetPosition
|
||||
// DoSetVirtualSize
|
||||
// DoGetVirtualSize
|
||||
|
||||
// GetClientAreaOrigin
|
||||
// Fit
|
||||
// SetSizeHints
|
||||
// SetVirtualSizeHints
|
||||
// GetMaxSize
|
||||
// Show
|
||||
// Enable
|
||||
// SetFocus
|
||||
// SetFocusFromKbd
|
||||
// AcceptsFocus
|
||||
// AcceptsFocusFromKeyboard
|
||||
// GetDefaultItem
|
||||
// SetDefaultItem
|
||||
// IsTopLevel
|
||||
// Which of these should be done???
|
||||
// AddChild
|
||||
// RemoveChild
|
||||
// Validate
|
||||
// TransferDataToWindow
|
||||
// TransferDataFromWindow
|
||||
// InitDialog
|
||||
// SetBackgroundColour
|
||||
// SetForegroundColour
|
||||
// Destroy
|
||||
// DoCaptureMouse
|
||||
// DoClientToScreen
|
||||
// DoHitTest
|
||||
// DoMoveWindow
|
||||
// DoPopupMenu
|
||||
// DoReleaseMouse
|
||||
// DoScreenToClient
|
||||
// DoSetToolTip
|
||||
// Enable
|
||||
// Fit
|
||||
// GetCharHeight
|
||||
// GetCharWidth
|
||||
// DoClientToScreen
|
||||
// DoScreenToClient
|
||||
// DoHitTest
|
||||
// DoPopupMenu
|
||||
// DoSetToolTip
|
||||
// DoCaptureMouse
|
||||
// DoReleaseMouse
|
||||
// DoMoveWindow
|
||||
// GetClientAreaOrigin
|
||||
// GetDefaultItem
|
||||
// IsTopLevel
|
||||
// RemoveChild
|
||||
// SetBackgroundColour
|
||||
// SetDefaultItem
|
||||
// SetFocus
|
||||
// SetFocusFromKbd
|
||||
// SetForegroundColour
|
||||
// SetSizeHints
|
||||
// SetVirtualSizeHints
|
||||
// Show
|
||||
|
||||
|
||||
// PYPRIVATE;
|
||||
// };
|
||||
%{ // 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;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user