X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/include/wx/univ/spinbutt.h diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h index e6f3fcb1d9..40a28c67a6 100644 --- a/include/wx/univ/spinbutt.h +++ b/include/wx/univ/spinbutt.h @@ -19,10 +19,10 @@ // ---------------------------------------------------------------------------- // actions supported by this control -#define wxACTION_SPIN_INC _T("inc") -#define wxACTION_SPIN_DEC _T("dec") +#define wxACTION_SPIN_INC wxT("inc") +#define wxACTION_SPIN_DEC wxT("dec") -class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase, +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase, public wxControlWithArrows { public: @@ -53,20 +53,26 @@ public: virtual int GetArrowState(wxScrollArrows::Arrow arrow) const; virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set); virtual bool OnArrow(wxScrollArrows::Arrow arrow); - virtual wxScrollArrows::Arrow HitTest(const wxPoint& pt) const; + virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const; // for wxStdSpinButtonInputHandler const wxScrollArrows& GetArrows() { return m_arrows; } + virtual bool PerformAction(const wxControlAction& action, + long numArg = 0, + const wxString& strArg = wxEmptyString); + + static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + { + return GetStdInputHandler(handlerDef); + } + protected: virtual wxSize DoGetBestClientSize() const; virtual void DoDraw(wxControlRenderer *renderer); virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual bool PerformAction(const wxControlAction& action, - long numArg = 0, - const wxString& strArg = wxEmptyString); - // the common part of all ctors void Init(); @@ -98,7 +104,7 @@ private: // wxStdScrollBarInputHandler) and processes keyboard events too // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStdSpinButtonInputHandler : public wxStdInputHandler +class WXDLLIMPEXP_CORE wxStdSpinButtonInputHandler : public wxStdInputHandler { public: wxStdSpinButtonInputHandler(wxInputHandler *inphand);