added wxLocale::GetLanguageInfo()

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

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index e75a0c41b5f0deb3942f365ac0c08d06a81b2e64..11ec3318c1c865bc7f9349280ee0fac03e5571bf 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -11,11 +11,14 @@
 #ifndef __GTKGAUGEH__
 #define __GTKGAUGEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_GAUGE
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -30,7 +33,7 @@ class wxGauge;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char* wxGaugeNameStr;
+extern const wxChar* wxGaugeNameStr;
 
 //-----------------------------------------------------------------------------
 // wxGaugeBox
@@ -38,9 +41,7 @@ extern const char* wxGaugeNameStr;
 
 class wxGauge: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxGauge)
-  
-  public:
+public:
     inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
 
     inline wxGauge( wxWindow *parent, wxWindowID id, int range,
@@ -70,13 +71,18 @@ class wxGauge: public wxControl
     // Are we a Win95/GTK progress bar, or a normal gauge?
     inline bool GetProgressBar() const { return m_useProgressBar; }
     
-  // implementation
+    // implementation
+    // -------------
     
     void ApplyWidgetStyle();
-  
-   int      m_rangeMax;
-   int      m_gaugePos;
-   bool     m_useProgressBar;
+    int      m_rangeMax;
+    int      m_gaugePos;
+    bool     m_useProgressBar;
+   
+private:
+    DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 
+#endif
+
 #endif // __GTKGAUGEH__