X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc0bffacebe299b312ce7fdf49a8825f466cf73f..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/msw/button.h diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index bb844575e3..d1f4c4e364 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -9,36 +9,34 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_BUTTON_H_ -#define _WX_BUTTON_H_ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "button.h" -#endif +#ifndef _WX_MSW_BUTTON_H_ +#define _WX_MSW_BUTTON_H_ // ---------------------------------------------------------------------------- // Pushbutton // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButton : public wxButtonBase +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: - wxButton() { } + wxButton() { Init(); } 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) { + Init(); + 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,32 +45,17 @@ public: virtual ~wxButton(); - virtual void SetDefault(); + virtual wxWindow *SetDefault(); // 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); - 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); - -private: - void MakeOwnerDrawn(); -#endif // __WIN32__ + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; protected: - // send a notification event, return TRUE if processed + // send a notification event, return true if processed bool SendClickEvent(); // default button handling @@ -82,13 +65,22 @@ protected: // set or unset BS_DEFPUSHBUTTON style static void SetDefaultStyle(wxButton *btn, bool on); - // 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); + + // true if the UAC symbol is shown + bool m_authNeeded; private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton) + void Init() + { + m_authNeeded = false; + } + + void OnCharHook(wxKeyEvent& event); + + wxDECLARE_EVENT_TABLE(); + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton); }; -#endif - // _WX_BUTTON_H_ +#endif // _WX_MSW_BUTTON_H_