X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc0bffacebe299b312ce7fdf49a8825f466cf73f..46bde8dcf2245956223da69cce5bf93ba22a087e:/include/wx/msw/button.h diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index bb844575e3..f777710dad 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -12,10 +12,6 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "button.h" -#endif - // ---------------------------------------------------------------------------- // Pushbutton // ---------------------------------------------------------------------------- @@ -26,7 +22,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, @@ -38,7 +34,7 @@ public: bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -54,13 +50,6 @@ public: virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual void ApplyParentThemeBackground(const wxColour& bg) - { - // avoide switching into owner-drawn mode - wxControl::SetBackgroundColour(bg); - } - -#ifdef __WIN32__ // coloured buttons support virtual bool SetBackgroundColour(const wxColour &colour); virtual bool SetForegroundColour(const wxColour &colour); @@ -69,10 +58,9 @@ public: private: void MakeOwnerDrawn(); -#endif // __WIN32__ protected: - // send a notification event, return TRUE if processed + // send a notification event, return true if processed bool SendClickEvent(); // default button handling