X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/msw/button.h diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index f777710dad..1ee21c4d1e 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -16,7 +16,7 @@ // Pushbutton // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButton : public wxButtonBase +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: wxButton() { } @@ -43,18 +43,23 @@ public: virtual ~wxButton(); - virtual void SetDefault(); + virtual wxWindow *SetDefault(); + + // overridden base class methods + virtual void SetLabel(const wxString& label); + virtual bool SetBackgroundColour(const wxColour &colour); + virtual bool SetForegroundColour(const wxColour &colour); // implementation from now on virtual void Command(wxCommandEvent& event); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual bool MSWCommand(WXUINT param, WXWORD id); - // 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; + + // returns true if the platform should explicitly apply a theme border + virtual bool CanApplyThemeBorder() const { return false; } private: void MakeOwnerDrawn(); @@ -72,11 +77,9 @@ 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) }; -#endif - // _WX_BUTTON_H_ +#endif // _WX_BUTTON_H_