add missing header to allow ../src/common/docview.cpp to compile

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

diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h
index 77c2abd9e91655f7e5d156b4c67a9ed2bd78bce4..8f122cc18fed2032f57c5f03fddd7ccc0d0aebde 100644 (file)
--- a/include/wx/univ/slider.h
+++ b/include/wx/univ/slider.h
@@ -6,13 +6,9 @@
 // Created:     09.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     09.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univslider.h"
-#endif
-

 #ifndef _WX_UNIV_SLIDER_H_
 #define _WX_UNIV_SLIDER_H_
 
 #ifndef _WX_UNIV_SLIDER_H_
 #define _WX_UNIV_SLIDER_H_
 


@@ -95,13 +91,13 @@ public:
         { return IsVert() ? wxVERTICAL : wxHORIZONTAL; }
 
     // do we have labels?
         { return IsVert() ? wxVERTICAL : wxHORIZONTAL; }
 
     // do we have labels?

-    bool HasLabels() const 
-        { return ((GetWindowStyle() & wxSL_LABELS) != 0) &
+    bool HasLabels() const
+        { return ((GetWindowStyle() & wxSL_LABELS) != 0) &&

                  ((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT)) != 0); }
 
     // do we have ticks?
                  ((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT)) != 0); }
 
     // do we have ticks?

-    bool HasTicks() const 
-        { return ((GetWindowStyle() & wxSL_TICKS) != 0) &
+    bool HasTicks() const
+        { return ((GetWindowStyle() & wxSL_TICKS) != 0) &&

                  ((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT|wxSL_BOTH)) != 0); }
 
     // implement wxControlWithThumb interface
                  ((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT|wxSL_BOTH)) != 0); }
 
     // implement wxControlWithThumb interface


@@ -114,7 +110,7 @@ public:
 
     virtual void SetShaftPartState(wxScrollThumb::Shaft shaftPart,
                                    int flag,
 
     virtual void SetShaftPartState(wxScrollThumb::Shaft shaftPart,
                                    int flag,

-                                   bool set = TRUE);
+                                   bool set = true);

 
     virtual void OnThumbDragStart(int pos);
     virtual void OnThumbDrag(int pos);
 
     virtual void OnThumbDragStart(int pos);
     virtual void OnThumbDrag(int pos);


@@ -149,7 +145,7 @@ protected:
     // normalize the value to fit in the range
     int NormalizeValue(int value) const;
 
     // normalize the value to fit in the range
     int NormalizeValue(int value) const;
 

-    // change the value by the given increment, return TRUE if really changed
+    // change the value by the given increment, return true if really changed

     bool ChangeValueBy(int inc);
 
     // change the value to the given one
     bool ChangeValueBy(int inc);
 
     // change the value to the given one