Get rid of wxFontMapper in wxBase library.

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

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index c1d22c1a988e8b9da3e3b0b0ceca3fca0733744c..e00e65d934a7c605f57b6bd3cf3de584390bf44e 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -11,7 +11,7 @@
 #ifndef __GTKGAUGEH__
 #define __GTKGAUGEH__
 
 #ifndef __GTKGAUGEH__
 #define __GTKGAUGEH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -75,18 +75,21 @@ public:
     int GetRange() const;
     int GetValue() const;
 
     int GetRange() const;
     int GetValue() const;
 

+    bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
+    
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

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

-    void ApplyWidgetStyle();
-

     // the max and current gauge values
     int m_rangeMax,
         m_gaugePos;
 
     // obsolete functions, don't use
     // 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; }
+#if WXWIN_COMPATIBILITY_2_2
+    bool GetProgressBar() const { return true; }

 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:
 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:


@@ -96,6 +99,10 @@ protected:
     // set the gauge value to the value of m_gaugePos
     void DoSetGauge();
 
     // 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)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };