X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0655ad290a99dc0d4e8ea86aec60c7833a53be53..ca6911c361b04290fe1f0e64b616249b3b3d71ba:/include/wx/msw/spinbutt.h?ds=inline diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h index fc42e4929f..778db17f85 100644 --- a/include/wx/msw/spinbutt.h +++ b/include/wx/msw/spinbutt.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.h +// Name: wx/univ/spinbutt.h // Purpose: wxSpinButton class // Author: Julian Smart // Modified by: @@ -12,32 +12,23 @@ #ifndef _WX_SPINBUTT_H_ #define _WX_SPINBUTT_H_ -#ifdef __GNUG__ -#pragma interface "spinbutt.h" -#endif - #include "wx/control.h" #include "wx/event.h" -#if defined(__WIN95__) - +#if wxUSE_SPINBTN -class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase { -DECLARE_DYNAMIC_CLASS(wxSpinButton) - public: - /* - * Public interface - */ + // construction wxSpinButton() { } wxSpinButton(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, - const wxString& name = "wxSpinButton") + const wxString& name = wxSPIN_BUTTON_NAME) { Create(parent, id, pos, size, style, name); } @@ -45,11 +36,11 @@ public: virtual ~wxSpinButton(); bool Create(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, - const wxString& name = "wxSpinButton"); + const wxString& name = wxSPIN_BUTTON_NAME); // accessors @@ -62,9 +53,23 @@ public: virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnScroll(int orientation, WXWORD wParam, WXWORD pos, WXHWND control); + + // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can + virtual bool AcceptsFocus() const { return false; } + + // returns true if the platform should explicitly apply a theme border + virtual bool CanApplyThemeBorder() const { return false; } + +protected: + virtual wxSize DoGetBestSize() const; + + // ensure that the control displays a value in the current range + virtual void NormalizeValue(); + +private: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton) }; -#endif - // _WX_WIN95__ -#endif - // _WX_SPINBUTT_H_ +#endif // wxUSE_SPINBTN + +#endif // _WX_SPINBUTT_H_