made wxHeaderColumnBase dtor virtual to avoid gcc warnings

[wxWidgets.git] / include / wx / unichar.h

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index defc237114679e57013165dc85fb0278dda39f45..9d0b593bd7918065be26e0ae3008b7d9329d9abb 100644 (file)
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -16,7 +16,7 @@
 #include "wx/stringimpl.h"
 
 class WXDLLIMPEXP_FWD_BASE wxUniCharRef;
-class WXDLLIMPEXP_FWD_BASE wxStringIteratorNode;
+class WXDLLIMPEXP_FWD_BASE wxString;
 
 // This class represents single Unicode character. It can be converted to
 // and from char or wchar_t and implements commonly used character operations.
@@ -155,7 +155,7 @@ private:
     {
 #if wxUSE_UNICODE
         if ( c < 0x80 )
-            return c;
+            return wx_truncate_cast(char, c);
 
         return ToHi8bit(c);
 #else
@@ -183,7 +183,7 @@ private:
 
     // create the reference
 #if wxUSE_UNICODE_UTF8
-    wxUniCharRef(wxStringIteratorNode& node, iterator pos) : m_node(node), m_pos(pos) {}
+    wxUniCharRef(wxString& str, iterator pos) : m_str(str), m_pos(pos) {}
 #else
     wxUniCharRef(iterator pos) : m_pos(pos) {}
 #endif
@@ -195,8 +195,8 @@ public:
     //     that must be used explicitly (this is more than using 'explicit'
     //     keyword on ctor!):
 #if wxUSE_UNICODE_UTF8
-    static wxUniCharRef CreateForString(wxStringIteratorNode& node, iterator pos)
-        { return wxUniCharRef(node, pos); }
+    static wxUniCharRef CreateForString(wxString& str, iterator pos)
+        { return wxUniCharRef(str, pos); }
 #else
     static wxUniCharRef CreateForString(iterator pos)
         { return wxUniCharRef(pos); }
@@ -287,7 +287,7 @@ private:
 private:
     // reference to the string and pointer to the character in string
 #if wxUSE_UNICODE_UTF8
-    wxStringIteratorNode& m_node;
+    wxString& m_str;
 #endif
     iterator m_pos;
 };