fix warnings in EventsSuppressor ctor from gcc with -O option

[wxWidgets.git] / include / wx / gtk1 / gauge.h

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index f014fcf379cc7d90bb5eaa9cf173028663688c87..42b516e2bf359e6ff22bb1132f71afe747b71c9b 100644 (file)
--- 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
@@ -27,19 +22,19 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxGauge;
+class WXDLLIMPEXP_FWD_CORE wxGauge;
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
-extern const wxChar* wxGaugeNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxGaugeBox
 //-----------------------------------------------------------------------------
 
-class wxGauge: public wxControl
+class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
 {
 public:
     wxGauge() { Init(); }
@@ -75,20 +70,18 @@ public:
     int GetRange() const;
     int GetValue() const;
 
+    bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
     // 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; }
@@ -96,10 +89,15 @@ protected:
     // set the gauge value to the value of m_gaugePos
     void DoSetGauge();
 
+    virtual wxSize DoGetBestSize() const;
+
+    virtual wxVisualAttributes GetDefaultAttributes() const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 
 #endif
 
-#endif // __GTKGAUGEH__
+#endif
+    // __GTKGAUGEH__