X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..aa0ffd1d926cb1282fb75a1ce0e083421ade2f0b:/include/wx/msw/gauge95.h?ds=sidebyside

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index 362a758654..c1ab4ab1d0 100644
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_
@@ -16,62 +16,68 @@
 #pragma interface "gauge95.h"
 #endif
 
+#if wxUSE_SLIDER
+
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // Group box
-class WXDLLEXPORT wxGauge95: public wxControl
+class WXDLLEXPORT wxGauge95 : public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxGauge95)
- public:
-  inline wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
-
-  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);
-  }
-
-  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);
-
-  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
+    DECLARE_DYNAMIC_CLASS(wxGauge95)
+
+public:
+    wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
+
+    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);
+    }
+
+    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);
+
+    int GetShadowWidth(void) const ;
+    int GetBezelFace(void) const ;
+    int GetRange(void) const ;
+    int GetValue(void) const ;
+
+    bool SetForegroundColour(const wxColour& col);
+    bool SetBackgroundColour(const wxColour& col);
+
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return FALSE; }
+
+    // Backward compatibility
 #if WXWIN_COMPATIBILITY
-  inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
+    void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
 #endif
 
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
 
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
-
- protected:
-   int      m_rangeMax;
-   int      m_gaugePos;
+protected:
+    int      m_rangeMax;
+    int      m_gaugePos;
 };
 
+#endif // wxUSE_GAUGE
+
 #endif
     // _GAUGEMSW_H_