X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/233f10bf15c7201e8733426cffdeb6595df539ae..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/msw/button.h diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index 19d204f2e1..d1f4c4e364 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -9,8 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_BUTTON_H_ -#define _WX_BUTTON_H_ +#ifndef _WX_MSW_BUTTON_H_ +#define _WX_MSW_BUTTON_H_ // ---------------------------------------------------------------------------- // Pushbutton @@ -19,7 +19,7 @@ class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: - wxButton() { m_imageData = NULL; } + wxButton() { Init(); } wxButton(wxWindow *parent, wxWindowID id, const wxString& label = wxEmptyString, @@ -29,7 +29,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { - m_imageData = NULL; + Init(); Create(parent, id, label, pos, size, style, validator, name); } @@ -47,25 +47,13 @@ public: 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); - 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(); - protected: // send a notification event, return true if processed bool SendClickEvent(); @@ -77,18 +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 wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); - virtual void DoSetBitmapPosition(wxDirection dir); + virtual bool DoGetAuthNeeded() const; + virtual void DoSetAuthNeeded(bool show); - class wxButtonImageData *m_imageData; + // 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_