X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7740bc414353cf5c70ddef37b3700d35b7188d32..e1146627e2bf16a48554e1c224f427dbd6247c5d:/include/wx/msw/gaugemsw.h diff --git a/include/wx/msw/gaugemsw.h b/include/wx/msw/gaugemsw.h index 627f842afe..78cf35fc14 100644 --- a/include/wx/msw/gaugemsw.h +++ b/include/wx/msw/gaugemsw.h @@ -18,7 +18,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; // Group box class WXDLLEXPORT wxGaugeMSW: public wxControl @@ -60,6 +60,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,10 +73,6 @@ public: protected: int m_rangeMax; int m_gaugePos; - - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); }; #endif