bug fixes for using wxTransientPopupWindow and wxDP_ALLOWNONE support from Andreas...

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 8177c3de275338415a6cd48bf443ce5448746478..9738d8ab7c32f45a2d03ec9afff9d5600971be4b 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -5,15 +5,15 @@
 // 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_
 

-#ifdef __GNUG__
-    #pragma implementation "gaugebase.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "gaugebase.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


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


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

-#ifdef __WXMAC_X__
-    virtual ~wxGaugeBase() { }
-#endif
+    wxGaugeBase() { m_rangeMax = m_gaugePos = 0; }
+    virtual ~wxGaugeBase();
+

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 int range,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 int range,


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


@@ -68,6 +85,8 @@ protected:
 
     // the current position
     int m_gaugePos;
 
     // the current position
     int m_gaugePos;

+
+    DECLARE_NO_COPY_CLASS(wxGaugeBase)

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -76,24 +95,19 @@ 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__
     #else // !__WIN95__

-        #include "wx/msw/gaugemsw.h"
-        #define wxGauge wxGaugeMSW
-        #define sm_classwxGauge sm_classwxGaugeMSW
+        // Gauge no longer supported on 16-bit Windows

     #endif
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/gauge.h"
     #endif
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/gauge.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/gauge.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/gauge.h"

 #elif defined(__WXPM__)
     #include "wx/os2/gauge.h"
 #elif defined(__WXPM__)
     #include "wx/os2/gauge.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/gauge.h"

 #endif
 
 #endif // wxUSE_GAUGE
 #endif
 
 #endif // wxUSE_GAUGE