X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e04fe03d0f0d5cda7f9c2712ed3a65988839002c..d022d3649e7fea5a182667121ceeab00e50a8c49:/include/wx/gtk/gauge.h diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index 4760676800..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(); } @@ -77,20 +72,18 @@ public: bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } + 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 -#ifdef 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; } @@ -98,6 +91,8 @@ protected: // set the gauge value to the value of m_gaugePos void DoSetGauge(); + virtual wxSize DoGetBestSize() const; + private: DECLARE_DYNAMIC_CLASS(wxGauge) };