General tidy-up (mainly typecasts) to allow the use of the SGI native

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

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 2aa81557e1bf8e35222707bea907297ffbd7c4ab..51e9563b56d9d8c39edda0add93a520300a4ba86 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -44,34 +44,34 @@ class wxGauge: public wxControl
   public:
     inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
 
   public:
     inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
 

-  inline wxGauge(wxWindow *parent, wxWindowID id,
+    inline wxGauge( wxWindow *parent, wxWindowID id,

            int range,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxGA_HORIZONTAL,
            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,
+           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,
            int range,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxGA_HORIZONTAL,

+           const wxValidator& validator = wxDefaultValidator,

            const wxString& name = wxGaugeNameStr );
            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; }
+    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:
  
 
  protected: