allow using CPPUNIT_ASSERT_EQUAL(int,unsigned) even on 64 bit platforms (see r59576)

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

diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h
index c8b0eb255a4011dea557cc115ec1d1dd65b2d54c..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_
 
 #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"
 


@@ -35,7 +31,7 @@ class WXDLLEXPORT wxScrollTimer;
 // wxScrollThumb: an abstraction of scrollbar thumb
 // ----------------------------------------------------------------------------
 
 // wxScrollThumb: an abstraction of scrollbar thumb
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxScrollThumb
+class WXDLLIMPEXP_CORE wxScrollThumb

 {
 public:
     enum Shaft
 {
 public:
     enum Shaft


@@ -80,16 +76,18 @@ 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;

 };
 
 // ----------------------------------------------------------------------------
 // wxControlWithThumb: interface implemented by controls using wxScrollThumb
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxControlWithThumb: interface implemented by controls using wxScrollThumb
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxControlWithThumb
+class WXDLLIMPEXP_CORE wxControlWithThumb

 {
 public:
 {
 public:

+    virtual ~wxControlWithThumb() {}
+

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


@@ -118,7 +116,7 @@ public:
     // responsible for refreshing the control
     virtual void SetShaftPartState(wxScrollThumb::Shaft shaftPart,
                                    int flag,
     // 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;
 
     // 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,
     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;
 };
     // scrollbar has reached the top/bottom)
     virtual bool OnPageScroll(int pageInc) = 0;
 };