Renameing funktions to prevent name clashes

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

diff --git a/include/wx/qt/gauge.h b/include/wx/qt/gauge.h
index 2aa81557e1bf8e35222707bea907297ffbd7c4ab..ce19d9ef1fb20d29e9fca2bd29477fc5985d642a 100644 (file)
--- a/include/wx/qt/gauge.h
+++ b/include/wx/qt/gauge.h
@@ -1,83 +1,69 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.h
-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Purpose:     wxGauge class
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifndef __GTKGAUGEH__
-#define __GTKGAUGEH__
+#ifndef _WX_GAUGE_H_
+#define _WX_GAUGE_H_
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "gauge.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
 #include "wx/control.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxGauge;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char* wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
 
-//-----------------------------------------------------------------------------
-// wxGaugeBox
-//-----------------------------------------------------------------------------
-
-class wxGauge: public wxControl
+// Group box
+class WXDLLEXPORT wxGauge: public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxGauge)
-  
-  public:
-    inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
+ public:
+  inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; }
 
   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)
   {
-    Create(parent, id, range, pos, size, style, name);
-  };
+    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 wxString& name = wxGaugeNameStr );
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxGaugeNameStr);
+
+  void SetShadowWidth(int w);
+  void SetBezelFace(int w);
+  void SetRange(int r);
+  void SetValue(int pos);
 
-  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;
+  int GetShadowWidth() const ;
+  int GetBezelFace() const ;
+  int GetRange() const ;
+  int GetValue() const ;
 
-  // Are we a Win95/GTK progress bar, or a normal gauge?
-  inline bool GetProgressBar(void) const { return m_useProgressBar; }
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+
+  virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
 
  protected:
- 
    int      m_rangeMax;
    int      m_gaugePos;
-   bool     m_useProgressBar;
 };
 
-#endif // __GTKGAUGEH__
+#endif
+    // _WX_GAUGE_H_