X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/401e3b6e5f50f15571b86297b5d1e3f55c473f6f..eaefbb887c448d837b97857a097426e591bbc1d0:/include/wx/msw/button.h?ds=sidebyside diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index b2b1d7060a..2728b70739 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -26,7 +26,7 @@ public: wxButton() { } wxButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -35,31 +35,10 @@ public: { Create(parent, id, label, pos, size, style, validator, name); } - - wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); - } bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -80,7 +59,7 @@ public: // avoide switching into owner-drawn mode wxControl::SetBackgroundColour(bg); } - + #ifdef __WIN32__ // coloured buttons support virtual bool SetBackgroundColour(const wxColour &colour); @@ -93,7 +72,7 @@ private: #endif // __WIN32__ protected: - // send a notification event, return TRUE if processed + // send a notification event, return true if processed bool SendClickEvent(); // default button handling