X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b782f2e0f6abc7baa9a8bfc158847a89d5d12145..5a32e18214d39968e22bd46ade02bd2bcb29458d:/include/wx/msw/spinbutt.h diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h index f4e119db99..295ea3867d 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: @@ -19,8 +19,6 @@ #include "wx/control.h" #include "wx/event.h" -#if defined(__WIN95__) - class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase { public: @@ -32,7 +30,7 @@ public: 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); } @@ -44,7 +42,7 @@ public: 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 @@ -58,14 +56,15 @@ public: 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; } + protected: - virtual wxSize DoGetBestSize(); + virtual wxSize DoGetBestSize() const; private: DECLARE_DYNAMIC_CLASS(wxSpinButton) }; -#endif - // __WIN95__ #endif // _WX_SPINBUTT_H_