More OS/2 stubs and caret fix

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

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 2aa81557e1bf8e35222707bea907297ffbd7c4ab..479d1d510de7a136d8f09a4cf9a5d0636c4c0021 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_GAUGE
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -42,42 +44,44 @@ class wxGauge: public wxControl
   DECLARE_DYNAMIC_CLASS(wxGauge)
   
   public:
-    inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
+    inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
 
-  inline wxGauge(wxWindow *parent, wxWindowID id,
-           int range,
+    inline wxGauge( wxWindow *parent, wxWindowID id, int range,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxGA_HORIZONTAL,
-           const wxString& name = wxGaugeNameStr)
-  {
-    Create(parent, id, range, pos, size, style, name);
-  };
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           int range,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxGaugeNameStr )
+    {
+      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) ) {};
-  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:
- 
+    void SetShadowWidth( int WXUNUSED(w) ) {};
+    void SetBezelFace( int WXUNUSED(w) ) {};
+    void SetRange( int r );
+    void SetValue( int pos );
+    int GetShadowWidth() const { return 0; };
+    int GetBezelFace() const { return 0; };
+    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;
 };
 
+#endif
+
 #endif // __GTKGAUGEH__