warning for 2.5.3

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

diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h
index 226f27a50fbe6ecd78f151a1bd6d00e3ef000d33..cd0b6c2475b80fe2a2489a685d5661970450f0f4 100644 (file)
--- a/include/wx/univ/scrarrow.h
+++ b/include/wx/univ/scrarrow.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_SCRARROW_H_
 #define _WX_UNIV_SCRARROW_H_
 
 #ifndef _WX_UNIV_SCRARROW_H_
 #define _WX_UNIV_SCRARROW_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univscrarrow.h"
 #endif
 
     #pragma interface "univscrarrow.h"
 #endif
 


@@ -54,7 +54,7 @@ public:
     // draws the arrow on the given DC in the given rectangle, uses
     // wxControlWithArrows::GetArrowState() to get its current state
     void DrawArrow(Arrow arrow, wxDC& dc, const wxRect& rect,
     // draws the arrow on the given DC in the given rectangle, uses
     // wxControlWithArrows::GetArrowState() to get its current state
     void DrawArrow(Arrow arrow, wxDC& dc, const wxRect& rect,

-                   bool scrollbarLike = FALSE) const;
+                   bool scrollbarLike = false) const;

 
     // process a mouse move, enter or leave event, possibly calling
     // wxControlWithArrows::SetArrowState() if wxControlWithArrows::HitTest()
 
     // process a mouse move, enter or leave event, possibly calling
     // wxControlWithArrows::SetArrowState() if wxControlWithArrows::HitTest()


@@ -100,13 +100,13 @@ public:
     // set or clear the specified flag in the arrow state: this function is
     // responsible for refreshing the control
     virtual void SetArrowFlag(wxScrollArrows::Arrow arrow,
     // set or clear the specified flag in the arrow state: this function is
     // responsible for refreshing the control
     virtual void SetArrowFlag(wxScrollArrows::Arrow arrow,

-                              int flag, bool set = TRUE) = 0;
+                              int flag, bool set = true) = 0;

 
     // hit testing: return on which arrow the point is (or Arrow_None)
     virtual wxScrollArrows::Arrow HitTest(const wxPoint& pt) const = 0;
 
 
     // hit testing: return on which arrow the point is (or Arrow_None)
     virtual wxScrollArrows::Arrow HitTest(const wxPoint& pt) const = 0;
 

-    // called when the arrow is pressed, return TRUE to continue scrolling and
-    // FALSE to stop it
+    // called when the arrow is pressed, return true to continue scrolling and
+    // false to stop it

     virtual bool OnArrow(wxScrollArrows::Arrow arrow) = 0;
 };
 
     virtual bool OnArrow(wxScrollArrows::Arrow arrow) = 0;
 };