X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..caa251e0739fb50063849598fee09372c9dbafd6:/include/wx/gauge.h diff --git a/include/wx/gauge.h b/include/wx/gauge.h index e80001d060..ddabd1d88e 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -12,7 +12,7 @@ #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 @@ -22,6 +22,20 @@ #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; // ---------------------------------------------------------------------------- @@ -31,7 +45,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; class WXDLLEXPORT wxGaugeBase : public wxControl { public: - wxGaugeBase() { } + wxGaugeBase() { m_rangeMax = m_gaugePos = 0; } virtual ~wxGaugeBase(); bool Create(wxWindow *parent, @@ -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; @@ -78,7 +95,6 @@ protected: #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