X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd0b170911637899ac3c126367ee5821f357c185..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/msw/button.h diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index 0b0476844e..d1f4c4e364 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.h +// Name: wx/msw/button.h // Purpose: wxButton class // Author: Julian Smart // Modified by: @@ -9,70 +9,78 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_BUTTON_H_ -#define _WX_BUTTON_H_ - -#ifdef __GNUG__ -#pragma interface "button.h" -#endif - -#include "wx/control.h" - -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; +#ifndef _WX_MSW_BUTTON_H_ +#define _WX_MSW_BUTTON_H_ // ---------------------------------------------------------------------------- // Pushbutton // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButton : public wxControl +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { -DECLARE_DYNAMIC_CLASS(wxButton) - public: - wxButton() { } - wxButton(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) + wxButton() { Init(); } + wxButton(wxWindow *parent, + wxWindowID id, + const wxString& label = wxEmptyString, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxButtonNameStr) { + Init(); + Create(parent, id, label, pos, size, style, validator, name); } - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& label = wxEmptyString, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxButtonNameStr); virtual ~wxButton(); - virtual void SetDefault(); - - static wxSize GetDefaultSize(); + virtual wxWindow *SetDefault(); // 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 WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + +protected: + // send a notification event, return true if processed + bool SendClickEvent(); + + // default button handling + void SetTmpDefault(); + void UnsetTmpDefault(); + + // set or unset BS_DEFPUSHBUTTON style + static void SetDefaultStyle(wxButton *btn, bool on); + + virtual bool DoGetAuthNeeded() const; + virtual void DoSetAuthNeeded(bool show); - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); + // true if the UAC symbol is shown + bool m_authNeeded; private: - void MakeOwnerDrawn(); -#endif // __WIN32__ + void Init() + { + m_authNeeded = false; + } -protected: - // send a notification event, return TRUE if processed - bool SendClickEvent(); + void OnCharHook(wxKeyEvent& event); - virtual wxSize DoGetBestSize() const; + wxDECLARE_EVENT_TABLE(); + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton); }; -#endif - // _WX_BUTTON_H_ +#endif // _WX_MSW_BUTTON_H_