reuse operator bool() check in compatibility_iterator::IndexOf() instead of rewriting it

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

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 6d2152338a3a1b289e35fe46330cf5c7d68d3934..e5150fb70a5b7a05f8d2e6e8bb6d1947b5bb965b 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxGauge;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];

 
 //-----------------------------------------------------------------------------
 // wxGaugeBox
 
 //-----------------------------------------------------------------------------
 // wxGaugeBox


@@ -74,6 +74,8 @@ public:
     
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

+
+    virtual wxVisualAttributes GetDefaultAttributes() const;

     
     // implementation
     // -------------
     
     // implementation
     // -------------


@@ -82,11 +84,6 @@ public:
     int m_rangeMax,
         m_gaugePos;
 
     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; }
 protected:
     // common part of all ctors
     void Init() { m_rangeMax = m_gaugePos = 0; }


@@ -96,8 +93,6 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;
 

-    virtual wxVisualAttributes GetDefaultAttributes() const;
-

 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };