X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc2b747254c8ec8eebba7fb63cd5da5d7166c0db..e564aa153eb1dc5ebd9f8c9f5f055c2a49c15b05:/include/wx/msw/gauge95.h?ds=sidebyside diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h index ca96b5f010..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,9 +16,11 @@ #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 @@ -60,6 +62,9 @@ public: 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); } @@ -70,11 +75,9 @@ public: 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_