A couple more 'int' to UWORD conversions I had not merged into my previous checkin.

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

diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h
index 070d25ca464928a1cd9ca7207b5eca3b1ac59db7..3b5569a769a1229e3b8099241dac80158f443bd1 100644 (file)
--- a/include/wx/msw/gauge.h
+++ b/include/wx/msw/gauge.h
@@ -1,81 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.h
-// Purpose:     wxGauge class
+// Purpose:     wxGauge header, includes gauge class headers as appropriate
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GAUGEH__
-#define __GAUGEH__
+#ifndef _WX_GAUGE_H_
+#define _WX_GAUGE_H_
 
 #ifdef __GNUG__
 #pragma interface "gauge.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
-
-// Group box
-class WXDLLEXPORT wxGauge: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxGauge)
- public:
-  inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = FALSE; }
-
-  inline wxGauge(wxWindow *parent, const wxWindowID id,
-           const int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           const long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr)
-  {
-    Create(parent, id, range, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, const wxWindowID id,
-           const int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           const long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr);
-
-  void SetShadowWidth(const int w);
-  void SetBezelFace(const int w);
-  void SetRange(const int r);
-  void SetValue(const int pos);
-
-  int GetShadowWidth(void) const ;
-  int GetBezelFace(void) const ;
-  int GetRange(void) const ;
-  int GetValue(void) const ;
-
-  void SetForegroundColour(const wxColour& col);
-  void SetBackgroundColour(const wxColour& col);
-
-  // Backward compatibility
-#if WXWIN_COMPATIBILITY
-  inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
+#ifdef __WIN95__
+#include "wx/msw/gauge95.h"
+#define wxGauge wxGauge95
+#define sm_classwxGauge sm_classwxGauge95
+#else
+#include "wx/msw/gaugemsw.h"
+#define wxGauge wxGaugeMSW
+#define sm_classwxGauge sm_classwxGaugeMSW
 #endif
 
-  void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
-
-  // Are we a Win95 progress bar, or a normal gauge?
-  inline bool GetProgressBar(void) const { return m_useProgressBar; }
-
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
-
- protected:
-   int      m_rangeMax;
-   int      m_gaugePos;
-   bool     m_useProgressBar;
-};
-
 #endif
-    // __GAUGEH__
+    // _WX_GAUGE_H_