wxTheApp can't be assigned to, anyhow, so make ms_appInstance private and provide...

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

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 51e9563b56d9d8c39edda0add93a520300a4ba86..c1d22c1a988e8b9da3e3b0b0ceca3fca0733744c 100644 (file)
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -2,9 +2,8 @@
 // Name:        gauge.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -12,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"
@@ -31,7 +33,7 @@ class wxGauge;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char* wxGaugeNameStr;
+extern const wxChar* wxGaugeNameStr;
 
 //-----------------------------------------------------------------------------
 // wxGaugeBox
@@ -39,45 +41,65 @@ extern const char* wxGaugeNameStr;
 
 class wxGauge: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxGauge)
-  
-  public:
-    inline wxGauge(void) { 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 )
+public:
+    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(void) const { return 0; };
-    int GetBezelFace(void) const { return 0; };
-    int GetRange(void) const;
-    int GetValue(void) const;
-
-    // Are we a Win95/GTK progress bar, or a normal gauge?
-    inline bool GetProgressBar(void) const { return m_useProgressBar; }
-
- protected:
- 
-   int      m_rangeMax;
-   int      m_gaugePos;
-   bool     m_useProgressBar;
+    int GetShadowWidth() const { return 0; };
+    int GetBezelFace() const { return 0; };
+    int GetRange() const;
+    int GetValue() 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; }
+
+    // set the gauge value to the value of m_gaugePos
+    void DoSetGauge();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 
+#endif
+
 #endif // __GTKGAUGEH__