X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f11bdd03b9623a61bfe3137beeefd7b1256bb9a1..eba99da4c0563e6508761272a1e1f1b791d0af6b:/include/wx/gauge.h diff --git a/include/wx/gauge.h b/include/wx/gauge.h index b468392fac..9738d8ab7c 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -5,15 +5,15 @@ // 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_ -#ifdef __GNUG__ - #pragma implementation "gaugebase.h" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma interface "gaugebase.h" #endif #include "wx/defs.h" @@ -22,7 +22,21 @@ #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,9 +45,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; class WXDLLEXPORT wxGaugeBase : public wxControl { public: -#ifdef __DARWIN__ - virtual ~wxGaugeBase() { } -#endif + wxGaugeBase() { m_rangeMax = m_gaugePos = 0; } + virtual ~wxGaugeBase(); + bool Create(wxWindow *parent, wxWindowID id, int range, @@ -51,8 +65,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; @@ -60,7 +77,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 @@ -68,6 +85,8 @@ protected: // the current position int m_gaugePos; + + DECLARE_NO_COPY_CLASS(wxGaugeBase) }; #if defined(__WXUNIVERSAL__) @@ -76,24 +95,19 @@ protected: #ifdef __WIN95__ #include "wx/msw/gauge95.h" #define wxGauge wxGauge95 - #define sm_classwxGauge sm_classwxGauge95 #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" -#elif defined(__WXQT__) - #include "wx/qt/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(__WXSTUBS__) - #include "wx/stubs/gauge.h" #endif #endif // wxUSE_GAUGE