X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fabb57533169f2f75367e0d120c762518548890..b4626104e5a68430c5c7c4f3a0b79425be9945e8:/include/wx/msw/gauge95.h

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index 99635c2669..ed1d7e1a0f 100644
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -6,75 +6,64 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_
 #define _GAUGE95_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "gauge95.h"
 #endif
 
-#include "wx/control.h"
+#if wxUSE_GAUGE
 
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr;
 
 // Group box
-class WXDLLEXPORT wxGauge95: public wxControl
+class WXDLLEXPORT wxGauge95 : public wxGaugeBase
 {
-  DECLARE_DYNAMIC_CLASS(wxGauge95)
- public:
-  inline wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
+public:
+    wxGauge95() { }
 
-  inline wxGauge95(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);
-  }
+    wxGauge95(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)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);
+    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 w);
-  void SetBezelFace(int w);
-  void SetRange(int r);
-  void SetValue(int pos);
+    // set gauge range/value
+    virtual void SetRange(int range);
+    virtual void SetValue(int pos);
 
-  int GetShadowWidth(void) const ;
-  int GetBezelFace(void) const ;
-  int GetRange(void) const ;
-  int GetValue(void) const ;
+    // overriden base class virtuals
+    virtual bool SetForegroundColour(const wxColour& col);
+    virtual bool SetBackgroundColour(const wxColour& col);
 
-  void SetForegroundColour(const wxColour& col);
-  void SetBackgroundColour(const wxColour& col);
+protected:
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+    virtual wxSize DoGetBestSize() const;
 
-  // Backward compatibility
-#if WXWIN_COMPATIBILITY
-  inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
-#endif
-
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-    { wxWindow::SetSize(rect, sizeFlags); }
-  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
 
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
-
- protected:
-   int      m_rangeMax;
-   int      m_gaugePos;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
 };
 
+#endif // wxUSE_GAUGE
+
 #endif
     // _GAUGEMSW_H_