X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24e97652b0f3a5796c3fab61d87b1f636d64ce79..696b38f7f5255a9aae92822efafc3de36e3390a5:/include/wx/gauge.h

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 830fecf778..9c81e0223e 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -5,24 +5,34 @@
 // Modified by:
 // Created:     20.02.01
 // RCS-ID:      $Id$
-// Copyright:   (c) 1996-2001 wxWindows team
+// Copyright:   (c) 1996-2001 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "gaugebase.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_GAUGE
 
 #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
@@ -31,6 +41,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:
+    wxGaugeBase() { m_rangeMax = m_gaugePos = 0; }
     virtual ~wxGaugeBase();
 
     bool Create(wxWindow *parent,
@@ -50,8 +61,11 @@ public:
     virtual void SetValue(int pos);
     virtual int GetValue() const;
 
-    // appearance params (not implemented for most ports)
+    // simple accessors
+    bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
 
+
+    // appearance params (not implemented for most ports)
     virtual void SetShadowWidth(int w);
     virtual int GetShadowWidth() const;
 
@@ -59,7 +73,7 @@ public:
     virtual int GetBezelFace() const;
 
     // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }
 
 protected:
     // the max position
@@ -67,18 +81,15 @@ protected:
 
     // the current position
     int m_gaugePos;
+
+    DECLARE_NO_COPY_CLASS(wxGaugeBase)
 };
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/gauge.h"
 #elif defined(__WXMSW__)
-    #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
+    #include "wx/msw/gauge95.h"
+    #define wxGauge wxGauge95
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)