X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..c21f7aa162dfc4ff910c67a9d6241557dab96075:/include/wx/gtk/gauge.h diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index 46f9cad23b..e5150fb70a 100644 --- a/include/wx/gtk/gauge.h +++ b/include/wx/gtk/gauge.h @@ -7,14 +7,9 @@ // 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,7 +28,7 @@ class WXDLLIMPEXP_CORE wxGauge; // global data //----------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr; +extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[]; //----------------------------------------------------------------------------- // wxGaugeBox @@ -79,6 +74,8 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + virtual wxVisualAttributes GetDefaultAttributes() const; // implementation // ------------- @@ -87,11 +84,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; } @@ -101,8 +93,6 @@ protected: virtual wxSize DoGetBestSize() const; - virtual wxVisualAttributes GetDefaultAttributes() const; - private: DECLARE_DYNAMIC_CLASS(wxGauge) };