X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6999b0d8e9740918ed66bff0ee6fe147b6367a97..e02c03a42ea85be1e908962c8a344fb2553e7c3e:/utils/wxPython/src/controls.i?ds=sidebyside diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i index 59c98cb7a9..931bfebd9d 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); }; @@ -194,7 +174,7 @@ public: wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, - int LCOUNT=0, wxString* LIST=NULL, + int LCOUNT=0, wxString* choices=NULL, long style = 0, const wxValidator& validator = wxPyDefaultValidator, char* name = "choice"); @@ -221,7 +201,7 @@ public: wxComboBox(wxWindow* parent, wxWindowID id, char* value = "", const wxPoint& pos = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, - int LCOUNT=0, wxString* LIST=NULL, + int LCOUNT=0, wxString* choices=NULL, long style = 0, const wxValidator& validator = wxPyDefaultValidator, char* name = "comboBox"); @@ -326,7 +306,7 @@ public: wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, - int LCOUNT, wxString* LIST = NULL, + int LCOUNT, wxString* choices = NULL, long style = 0, const wxValidator& validator = wxPyDefaultValidator, char* name = "listBox"); @@ -355,13 +335,13 @@ public: } } - void InsertItems(int LCOUNT, wxString* LIST, int pos); + void InsertItems(int LCOUNT, wxString* choices, int pos); wxString GetString(int n); wxString GetStringSelection(); int Number(); bool Selected(const int n); - void Set(int LCOUNT, wxString* LIST); + void Set(int LCOUNT, wxString* choices); // TODO: void SetClientData(const int n, char* data); void SetFirstItem(int n); %name(SetFirstItemStr)void SetFirstItem(const wxString& string); @@ -379,7 +359,7 @@ public: const wxPoint& pos = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, int LCOUNT = 0, - wxString* LIST = NULL, + wxString* choices = NULL, long style = 0, const wxValidator& validator = wxPyDefaultValidator, char* name = "listBox"); @@ -388,7 +368,7 @@ public: bool IsChecked(int uiIndex); void Check(int uiIndex, int bCheck = TRUE); - void InsertItems(int LCOUNT, wxString* LIST, int pos); + void InsertItems(int LCOUNT, wxString* choices, int pos); int GetItemHeight(); }; @@ -516,7 +496,7 @@ public: const wxString& label, const wxPoint& point = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, - int LCOUNT = 0, wxString* LIST = NULL, + int LCOUNT = 0, wxString* choices = NULL, int majorDimension = 0, long style = wxRA_HORIZONTAL, const wxValidator& validator = wxPyDefaultValidator,