X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..058f225a44d83d42ba9d773efc705badbf0e5e3c:/include/wx/univ/scrarrow.h diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h index 841db25ef5..2621c16de5 100644 --- a/include/wx/univ/scrarrow.h +++ b/include/wx/univ/scrarrow.h @@ -23,17 +23,17 @@ // to derive from the wxControlWithArrows interface and implement its methods. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlWithArrows; -class WXDLLEXPORT wxDC; -class WXDLLEXPORT wxMouseEvent; -class WXDLLEXPORT wxRect; -class WXDLLEXPORT wxRenderer; +class WXDLLIMPEXP_FWD_CORE wxControlWithArrows; +class WXDLLIMPEXP_FWD_CORE wxDC; +class WXDLLIMPEXP_FWD_CORE wxMouseEvent; +class WXDLLIMPEXP_FWD_CORE wxRect; +class WXDLLIMPEXP_FWD_CORE wxRenderer; // ---------------------------------------------------------------------------- // wxScrollArrows: an abstraction of scrollbar arrow // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollArrows +class WXDLLIMPEXP_CORE wxScrollArrows { public: enum Arrow @@ -53,8 +53,9 @@ public: bool scrollbarLike = false) const; // process a mouse move, enter or leave event, possibly calling - // wxControlWithArrows::SetArrowState() if wxControlWithArrows::HitTest() - // says that the mosue has left/entered an arrow + // wxControlWithArrows::SetArrowState() if + // wxControlWithArrows::HitTestArrow() says that the mouse has left/entered + // an arrow bool HandleMouseMove(const wxMouseEvent& event) const; // process a mouse click event @@ -78,9 +79,11 @@ private: // wxControlWithArrows: interface implemented by controls using wxScrollArrows // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlWithArrows +class WXDLLIMPEXP_CORE wxControlWithArrows { public: + virtual ~wxControlWithArrows() {} + // get the renderer to use for drawing the arrows virtual wxRenderer *GetRenderer() const = 0; @@ -99,7 +102,7 @@ public: int flag, bool set = true) = 0; // hit testing: return on which arrow the point is (or Arrow_None) - virtual wxScrollArrows::Arrow HitTest(const wxPoint& pt) const = 0; + virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const = 0; // called when the arrow is pressed, return true to continue scrolling and // false to stop it