Added wxRendererNative::DrawTitleBarBitmap().

[wxWidgets.git] / include / wx / univ / scrthumb.h

diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h
index 17b501abfd08519980dff85293b487ad6a7595b9..25a6ce98e0a977dd2f7b6f3307d00bd843453dc2 100644 (file)
--- 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_
 
-#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
     // ----------------