X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..e934052eb0998995bfaf12cb7bed96525e1437df:/include/wx/gtk/gauge.h diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index 5652b6b5cb..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 @@ -27,19 +22,19 @@ // classes //----------------------------------------------------------------------------- -class wxGauge; +class WXDLLIMPEXP_CORE wxGauge; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar* wxGaugeNameStr; +extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[]; //----------------------------------------------------------------------------- // wxGaugeBox //----------------------------------------------------------------------------- -class wxGauge: public wxControl +class WXDLLIMPEXP_CORE wxGauge: public wxControl { public: wxGauge() { Init(); } @@ -79,21 +74,16 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + virtual wxVisualAttributes GetDefaultAttributes() const; // implementation // ------------- - void ApplyWidgetStyle(); - // the max and current gauge values 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; } @@ -103,8 +93,6 @@ protected: virtual wxSize DoGetBestSize() const; - virtual wxVisualAttributes GetDefaultAttributes() const; - private: DECLARE_DYNAMIC_CLASS(wxGauge) };