X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6999b0d8e9740918ed66bff0ee6fe147b6367a97..b854b7b82e033d1dbd9d300402df50ec5e1e8b74:/utils/wxPython/src/controls.i diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i index 59c98cb7a9..f695ceb0bb 100644 --- a/utils/wxPython/src/controls.i +++ b/utils/wxPython/src/controls.i @@ -60,44 +60,22 @@ wxValidator wxDefaultValidator; class wxControl : public wxWindow { public: - wxControl(); + wxControl(wxWindow *parent, + wxWindowID id, + const wxPoint& pos=wxPyDefaultPosition, + const wxSize& size=wxPyDefaultSize, + long style=0, + const wxValidator& validator=wxPyDefaultValidator, + const char* name="control"); + + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" -#ifdef __WXMSW__ void Command(wxCommandEvent& event); -#endif wxString GetLabel(); void SetLabel(const wxString& label); }; -// %{ -// class wxPyControl : public wxControl { -// public: -// wxPyControl(wxWindow *parent, -// wxWindowID id, -// const wxPoint& pos, -// const wxSize& size, -// long style, -// const wxValidator& validator, -// const wxString& name) -// : wxControl() { -// CreateControl(parent, id, pos, size, style, validator, name); -// } -// }; -// %} - - -// class wxPyControl : public wxControl { -// public: -// wxPyControl(wxWindow* parent, wxWindowID id, -// const wxPoint& pos = wxPyDefaultPosition, -// const wxSize& size = wxPyDefaultSize, -// long style = 0, -// const wxValidator& validator = wxPyDefaultValidator, -// char* name = "control"); -// }; - - //---------------------------------------------------------------------- class wxButton : public wxControl { @@ -112,6 +90,8 @@ public: %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" void SetDefault(); + void SetBackgroundColour(const wxColour& colour); + void SetForegroundColour(const wxColour& colour); };