X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcf90ee1b10d41b4ddfbfa537481a9c64e30348f..1191c93ebc356c379a6c20c0214b3a14562cfbdf:/include/wx/msw/button.h?ds=sidebyside diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index 3ee9145ae9..25f4ba1ad7 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, @@ -36,30 +32,9 @@ 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, @@ -75,22 +50,15 @@ 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); virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; private: void MakeOwnerDrawn(); -#endif // __WIN32__ protected: // send a notification event, return true if processed @@ -105,7 +73,6 @@ protected: // usually overridden base class virtuals virtual wxSize DoGetBestSize() const; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ; private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)