superposition of text styles in wxTextCtrl now works as expected (and as documented)

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

diff --git a/include/wx/msw/gaugemsw.h b/include/wx/msw/gaugemsw.h
index 45774569bafdf5ee2ba9323f4ec4b613790e6a19..78cf35fc14a817569166ea68ec296b28a8f9b070 100644 (file)
--- a/include/wx/msw/gaugemsw.h
+++ b/include/wx/msw/gaugemsw.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

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

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


@@ -57,8 +57,11 @@ public:
     int GetRange(void) const ;
     int GetValue(void) const ;
 
     int GetRange(void) const ;
     int GetValue(void) const ;
 

-    void SetForegroundColour(const wxColour& col);
-    void 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
 
     // Backward compatibility
 #if WXWIN_COMPATIBILITY


@@ -70,10 +73,6 @@ 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
 };
 
 #endif