X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..90a77e64841dfcaf37103b6411987402739baa0b:/include/wx/gtk1/gauge.h diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h index 46f9cad23b..3e8f8255ab 100644 --- a/include/wx/gtk1/gauge.h +++ b/include/wx/gtk1/gauge.h @@ -1,20 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gauge.h +// Name: wx/gtk1/gauge.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKGAUGEH__ #define __GTKGAUGEH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #if wxUSE_GAUGE @@ -33,13 +28,13 @@ class WXDLLIMPEXP_CORE wxGauge; // global data //----------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr; +extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[]; //----------------------------------------------------------------------------- // wxGaugeBox //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxGauge: public wxControl +class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase { public: wxGauge() { Init(); } @@ -76,10 +71,10 @@ public: int GetValue() const; bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } - + static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation // ------------- @@ -87,11 +82,6 @@ public: int m_rangeMax, m_gaugePos; - // obsolete functions, don't use -#if WXWIN_COMPATIBILITY_2_2 - bool GetProgressBar() const { return true; } -#endif // WXWIN_COMPATIBILITY_2_2 - protected: // common part of all ctors void Init() { m_rangeMax = m_gaugePos = 0; } @@ -109,4 +99,5 @@ private: #endif -#endif // __GTKGAUGEH__ +#endif + // __GTKGAUGEH__