X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20e05ffbd3eff02a4c643e412d4f600cdea26952..ec75d791f043b3b43cac9825a2c62e9d5321e616:/include/wx/gtk/gauge.h

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index ee018c01a1..c1d22c1a98 100644
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -11,7 +11,7 @@
 #ifndef __GTKGAUGEH__
 #define __GTKGAUGEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -33,7 +33,7 @@ class wxGauge;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char* wxGaugeNameStr;
+extern const wxChar* wxGaugeNameStr;
 
 //-----------------------------------------------------------------------------
 // wxGaugeBox
@@ -42,25 +42,32 @@ extern const char* wxGaugeNameStr;
 class wxGauge: public wxControl
 {
 public:
-    inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
-
-    inline wxGauge( wxWindow *parent, wxWindowID id, int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr )
+    wxGauge() { Init(); }
+
+    wxGauge( wxWindow *parent,
+             wxWindowID id,
+             int range,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxGA_HORIZONTAL,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxGaugeNameStr )
     {
-      Create(parent, id, range, pos, size, style, validator, name);
+        Init();
+
+        Create(parent, id, range, pos, size, style, validator, name);
     }
-    bool Create( wxWindow *parent, wxWindowID id, int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr );
-    void SetShadowWidth( int WXUNUSED(w) ) {};
-    void SetBezelFace( int WXUNUSED(w) ) {};
+
+    bool Create( wxWindow *parent,
+                 wxWindowID id, int range,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxGA_HORIZONTAL,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxGaugeNameStr );
+
+    void SetShadowWidth( int WXUNUSED(w) ) { }
+    void SetBezelFace( int WXUNUSED(w) ) { }
     void SetRange( int r );
     void SetValue( int pos );
     int GetShadowWidth() const { return 0; };
@@ -68,17 +75,27 @@ public:
     int GetRange() const;
     int GetValue() const;
 
-    // Are we a Win95/GTK progress bar, or a normal gauge?
-    inline bool GetProgressBar() const { return m_useProgressBar; }
-    
     // implementation
     // -------------
-    
+
     void ApplyWidgetStyle();
-    int      m_rangeMax;
-    int      m_gaugePos;
-    bool     m_useProgressBar;
-   
+
+    // 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; }
+
+    // set the gauge value to the value of m_gaugePos
+    void DoSetGauge();
+
 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };