reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/msw/gaugemsw.h b/include/wx/msw/gaugemsw.h
index 627f842afe907f53011996b0ef80710fc3d72edd..78cf35fc14a817569166ea68ec296b28a8f9b070 100644 (file)
--- 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