corrected link to gettext manual (part of patch 1686335)

[wxWidgets.git] / src / common / unichar.cpp

diff --git a/src/common/unichar.cpp b/src/common/unichar.cpp
index 5dbe8b0825988fc5951dd06bd8b79eb3bfbc2c8b..9e8ef8df4f39cf4ff0cabeeaf92b6a1a1ec53c9f 100644 (file)
--- a/src/common/unichar.cpp
+++ b/src/common/unichar.cpp
@@ -19,6 +19,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/strconv.h"  // wxConvLibc
+#endif
+

 #include "wx/unichar.h"
 
 // ===========================================================================
 #include "wx/unichar.h"
 
 // ===========================================================================


@@ -26,7 +30,7 @@
 // ===========================================================================
 
 /* static */
 // ===========================================================================
 
 /* static */

-wxUniChar::unicode_type wxUniChar::From8bit(char c)
+wxUniChar::value_type wxUniChar::From8bit(char c)

 {
     // all supported charsets have the first 128 characters same as ASCII:
     if ( (unsigned char)c < 0x80 )
 {
     // all supported charsets have the first 128 characters same as ASCII:
     if ( (unsigned char)c < 0x80 )


@@ -39,7 +43,7 @@ wxUniChar::unicode_type wxUniChar::From8bit(char c)
 }
 
 /* static */
 }
 
 /* static */

-char wxUniChar::To8bit(wxUniChar::unicode_type c)
+char wxUniChar::To8bit(wxUniChar::value_type c)

 {
     // all supported charsets have the first 128 characters same as ASCII:
     if ( c < 0x80 )
 {
     // all supported charsets have the first 128 characters same as ASCII:
     if ( c < 0x80 )