X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..e4c903b2ea42fe104ef50d0ea6028f14d8309dfa:/include/wx/msw/button.h?ds=sidebyside diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index 15bdaf3482..1f5ad27c9b 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -12,33 +12,31 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#ifdef __GNUG__ -#pragma interface "button.h" -#endif - // ---------------------------------------------------------------------------- // Pushbutton // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButton : public wxButtonBase +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: - wxButton() { } + wxButton() { m_imageData = NULL; } wxButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { + m_imageData = NULL; + Create(parent, id, label, pos, size, 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, @@ -47,26 +45,29 @@ 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 long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual bool MSWCommand(WXUINT param, WXWORD id); -#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; + + // returns true if the platform should explicitly apply a theme border + virtual bool CanApplyThemeBorder() const { return false; } 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 @@ -78,11 +79,26 @@ protected: // usually overridden base class virtuals virtual wxSize DoGetBestSize() const; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ; + + virtual bool DoGetAuthNeeded() const; + virtual void DoSetAuthNeeded(bool show); + virtual wxBitmap DoGetBitmap(State which) const; + virtual void DoSetBitmap(const wxBitmap& bitmap, State which); + virtual wxSize DoGetBitmapMargins() const; + virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); + virtual void DoSetBitmapPosition(wxDirection dir); + + // Increases the passed in size if necessary to account for the + // button image, if any + void AdjustForBitmapSize(wxSize& size) const; + + class wxButtonImageData *m_imageData; + + // true if the UAC symbol is shown + bool m_authNeeded; private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton) + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton); }; -#endif - // _WX_BUTTON_H_ +#endif // _WX_BUTTON_H_