X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..058f225a44d83d42ba9d773efc705badbf0e5e3c:/include/wx/univ/spinbutt.h?ds=sidebyside diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h index 9be6520514..aac61f9644 100644 --- a/include/wx/univ/spinbutt.h +++ b/include/wx/univ/spinbutt.h @@ -22,7 +22,7 @@ #define wxACTION_SPIN_INC _T("inc") #define wxACTION_SPIN_DEC _T("dec") -class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase, +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase, public wxControlWithArrows { public: @@ -53,7 +53,7 @@ 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; } @@ -62,6 +62,12 @@ public: 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); @@ -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);