applied wxNativeFontInfo patch from Derry Bryson (with minor changes)

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

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index ca96b5f0103b15136f73804a664ef0517a1b0afb..3cb7379a65379f819f17efe37d17390dda623ac5 100644 (file)
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.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 wxGauge95 : 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