don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h
index 19811cde79431e4ec63c52caed9c99e001126b25..17b501abfd08519980dff85293b487ad6a7595b9 100644 (file)
--- a/include/wx/univ/scrthumb.h
+++ b/include/wx/univ/scrthumb.h
@@ -12,8 +12,8 @@
 #ifndef _WX_UNIV_SCRTHUMB_H_
 #define _WX_UNIV_SCRTHUMB_H_
 
 #ifndef _WX_UNIV_SCRTHUMB_H_
 #define _WX_UNIV_SCRTHUMB_H_
 

-#ifdef __GNUG__
-    #pragma interface "scrthumb.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "univscrthumb.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -118,7 +118,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 +134,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;
 };