fix warnings in EventsSuppressor ctor from gcc with -O option

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

diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h
index 17b501abfd08519980dff85293b487ad6a7595b9..00ab7aacaef2ed54f4d2f5b1bd75567b9e98fc9b 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_
 
 #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
 // ----------------------------------------------------------------------------
 // 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.
 // ----------------------------------------------------------------------------
 
 // 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"
 
 
 #include "wx/timer.h"
 


@@ -80,7 +76,7 @@ private:
     Shaft m_shaftPart;
 
     // the data for the mouse capture
     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:
 class WXDLLEXPORT wxControlWithThumb
 {
 public:

+    virtual ~wxControlWithThumb() {}
+

     // simple accessors
     // ----------------
 
     // simple accessors
     // ----------------