X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/gauge.h?ds=sidebyside diff --git a/include/wx/gauge.h b/include/wx/gauge.h index e704797be7..61dd3fa1f6 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -12,10 +12,6 @@ #ifndef _WX_GAUGE_H_BASE_ #define _WX_GAUGE_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "gaugebase.h" -#endif - #include "wx/defs.h" #if wxUSE_GAUGE @@ -32,11 +28,20 @@ // Win32 only, is default (and only) on some other platforms #define wxGA_SMOOTH 0x0020 -// obsolete style -#define wxGA_PROGRESSBAR 0 - +#if WXWIN_COMPATIBILITY_2_6 + // obsolete style + #define wxGA_PROGRESSBAR 0 +#endif // WXWIN_COMPATIBILITY_2_6 + +// GTK and Mac always have native implementation of the indeterminate mode +// wxMSW has native implementation only if comctl32.dll >= 6.00 +#if !defined(__WXGTK20__) && !defined(__WXMAC__) && !defined(__WXCOCOA__) + #define wxGAUGE_EMULATE_INDETERMINATE_MODE 1 +#else + #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0 +#endif -WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[]; // ---------------------------------------------------------------------------- // wxGauge: a progress bar @@ -57,18 +62,21 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxGaugeNameStr); + // determinate mode API + // set/get the control range virtual void SetRange(int range); virtual int GetRange() const; - // position virtual void SetValue(int pos); virtual int GetValue() const; + // indeterminate mode API + virtual void Pulse(); + // 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; @@ -77,7 +85,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 @@ -86,22 +94,24 @@ protected: // the current position int m_gaugePos; +#if wxGAUGE_EMULATE_INDETERMINATE_MODE + int m_nDirection; // can be wxRIGHT or wxLEFT +#endif + 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 - #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__) +#elif defined(__WXGTK20__) #include "wx/gtk/gauge.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/gauge.h" #elif defined(__WXMAC__) #include "wx/mac/gauge.h" #elif defined(__WXCOCOA__)