MVC works now.

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

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index c1d22c1a988e8b9da3e3b0b0ceca3fca0733744c..e5150fb70a5b7a05f8d2e6e8bb6d1947b5bb965b 100644 (file)
--- 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(__APPLE__)
-#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(); }
@@ -75,20 +70,20 @@ public:
     int GetRange() const;
     int GetValue() const;
 
+    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; }
@@ -96,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)
 };