X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/univ/scrthumb.h diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h index 27aa0eb042..25a6ce98e0 100644 --- a/include/wx/univ/scrthumb.h +++ b/include/wx/univ/scrthumb.h @@ -6,16 +6,12 @@ // Created: 12.02.01 // RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIV_SCRTHUMB_H_ #define _WX_UNIV_SCRTHUMB_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univscrthumb.h" -#endif - // ---------------------------------------------------------------------------- // wxScrollThumb is not a control but just a class containing the common // functionality of scroll thumb such as used by scrollbars, sliders and maybe @@ -24,10 +20,10 @@ // This class is similar to wxScrollThumb. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlWithThumb; -class WXDLLEXPORT wxMouseEvent; -class WXDLLEXPORT wxRect; -class WXDLLEXPORT wxScrollTimer; +class WXDLLIMPEXP_FWD_CORE wxControlWithThumb; +class WXDLLIMPEXP_FWD_CORE wxMouseEvent; +class WXDLLIMPEXP_FWD_CORE wxRect; +class WXDLLIMPEXP_FWD_CORE wxScrollTimer; #include "wx/timer.h" @@ -35,7 +31,7 @@ class WXDLLEXPORT wxScrollTimer; // wxScrollThumb: an abstraction of scrollbar thumb // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollThumb +class WXDLLIMPEXP_CORE wxScrollThumb { public: enum Shaft @@ -80,16 +76,18 @@ private: Shaft m_shaftPart; // the data for the mouse capture - struct WXDLLEXPORT wxScrollThumbCaptureData *m_captureData; + struct WXDLLIMPEXP_FWD_CORE wxScrollThumbCaptureData *m_captureData; }; // ---------------------------------------------------------------------------- // wxControlWithThumb: interface implemented by controls using wxScrollThumb // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlWithThumb +class WXDLLIMPEXP_CORE wxControlWithThumb { public: + virtual ~wxControlWithThumb() {} + // simple accessors // ---------------- @@ -118,7 +116,7 @@ public: // responsible for refreshing the control virtual void SetShaftPartState(wxScrollThumb::Shaft shaftPart, int flag, - bool set = TRUE) = 0; + bool set = true) = 0; // called when the user starts dragging the thumb virtual void OnThumbDragStart(int pos) = 0; @@ -134,7 +132,7 @@ public: virtual void OnPageScrollStart() = 0; // called while the user keeps the mouse pressed above/below the thumb, - // return TRUE to continue scrollign and FALSE to stop it (e.g. because the + // return true to continue scrollign and false to stop it (e.g. because the // scrollbar has reached the top/bottom) virtual bool OnPageScroll(int pageInc) = 0; };