Toolbar/tooltip udates

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

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index ca96b5f0103b15136f73804a664ef0517a1b0afb..c1ab4ab1d0b0929f604217bea5e8a4b255aeec99 100644 (file)
--- 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
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_


@@ -16,9 +16,11 @@
 #pragma interface "gauge95.h"
 #endif
 
 #pragma interface "gauge95.h"
 #endif
 

+#if wxUSE_SLIDER
+

 #include "wx/control.h"
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;

 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxControl
 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxControl


@@ -60,6 +62,9 @@ public:
     bool SetForegroundColour(const wxColour& col);
     bool SetBackgroundColour(const wxColour& col);
 
     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
     void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
     // Backward compatibility
 #if WXWIN_COMPATIBILITY
     void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }


@@ -70,11 +75,9 @@ public:
 protected:
     int      m_rangeMax;
     int      m_gaugePos;
 protected:
     int      m_rangeMax;
     int      m_gaugePos;

-
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);

 };
 
 };
 

+#endif // wxUSE_GAUGE
+

 #endif
     // _GAUGEMSW_H_
 #endif
     // _GAUGEMSW_H_