added wxDP_SPIN/DROPDOWN styles (only Win32 native version implements the former)

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index e80001d06046036c6018403c3314b8261c238b20..74e55c38c6e72ede79a2df484f80692fa7d1512e 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -5,14 +5,14 @@
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 

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

     #pragma interface "gaugebase.h"
 #endif
 
     #pragma interface "gaugebase.h"
 #endif
 


@@ -22,6 +22,20 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+// ----------------------------------------------------------------------------
+// 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
+
+

 WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // ----------------------------------------------------------------------------
 WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // ----------------------------------------------------------------------------


@@ -31,7 +45,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:
 class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:

-    wxGaugeBase() { }
+    wxGaugeBase() { m_rangeMax = m_gaugePos = 0; }

     virtual ~wxGaugeBase();
 
     bool Create(wxWindow *parent,
     virtual ~wxGaugeBase();
 
     bool Create(wxWindow *parent,


@@ -51,8 +65,11 @@ public:
     virtual void SetValue(int pos);
     virtual int GetValue() const;
 
     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;
 
     virtual void SetShadowWidth(int w);
     virtual int GetShadowWidth() const;
 


@@ -60,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


@@ -78,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