X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3870b2ff595ba4bb4f0397ace77ceeb9628e94d..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/univ/scrthumb.h diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h index 1e4fbf4874..00ab7aacae 100644 --- a/include/wx/univ/scrthumb.h +++ b/include/wx/univ/scrthumb.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_SCRTHUMB_H_ #define _WX_UNIV_SCRTHUMB_H_ -#ifdef __GNUG__ - #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" @@ -80,7 +76,7 @@ private: Shaft m_shaftPart; // the data for the mouse capture - struct WXDLLEXPORT wxScrollThumbCaptureData *m_captureData; + struct WXDLLIMPEXP_FWD_CORE wxScrollThumbCaptureData *m_captureData; }; // ---------------------------------------------------------------------------- @@ -90,6 +86,8 @@ private: class WXDLLEXPORT 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; };