define wxUSE_LINE_IN_LISTBOOK to avoid -Wundef warnings (but define it as 0 so thje...

[wxWidgets.git] / include / wx / gauge.h

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 17fbc5206e11dc2ae0745f20f9b73d6dc2b2cdc2..9738d8ab7c32f45a2d03ec9afff9d5600971be4b 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     20.02.01
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     20.02.01
 // RCS-ID:      $Id$

-// Copyright:   (c) 1996-2001 wxWindows team
+// Copyright:   (c) 1996-2001 wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -22,7 +22,21 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+// ----------------------------------------------------------------------------
+// wxGauge style flags
+// ----------------------------------------------------------------------------
+
+#define wxGA_HORIZONTAL      wxHORIZONTAL
+#define wxGA_VERTICAL        wxVERTICAL
+
+// Win32 only, is default (and only) on some other platforms
+#define wxGA_SMOOTH          0x0020
+
+// obsolete style
+#define wxGA_PROGRESSBAR     0
+
+
+extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr;

 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar


@@ -63,7 +77,7 @@ public:
     virtual int GetBezelFace() const;
 
     // overriden base class virtuals
     virtual int GetBezelFace() const;
 
     // overriden base class virtuals

-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }

 
 protected:
     // the max position
 
 protected:
     // the max position


@@ -81,7 +95,6 @@ protected:
     #ifdef __WIN95__
         #include "wx/msw/gauge95.h"
         #define wxGauge wxGauge95
     #ifdef __WIN95__
         #include "wx/msw/gauge95.h"
         #define wxGauge wxGauge95

-        #define sm_classwxGauge sm_classwxGauge95

     #else // !__WIN95__
         // Gauge no longer supported on 16-bit Windows
     #endif
     #else // !__WIN95__
         // Gauge no longer supported on 16-bit Windows
     #endif