Patch #775355 Unicode fix for STC

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index 2f54e83f76a2af18c90dce9b277da819da102981..a2060dbf888a3d0b370bb9e36c1a5354f1472170 100644 (file)
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -2478,13 +2478,14 @@ inline wxString stc2wx(const char* str) {
 #endif
 }
 
 #endif
 }
 

-inline wxString stc2wx(const char* str, size_t len) {

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    return wxString(str, wxConvUTF8, len);
+wxString stc2wx(const char* str, size_t len);

 #else
 #else

+inline wxString stc2wx(const char* str, size_t len) {

     return wxString(str, len);
     return wxString(str, len);

-#endif

 }
 }

+#endif
+

 
 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {
 
 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index eb21c76bb2b8f7ca4340870310cf39acb3ec9feb..98eba98548317d43d6aa1262842000d73456684b 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -481,7 +481,7 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
     // so figure it out and fix it!
     i = 0;
     size_t ui = 0;
     // so figure it out and fix it!
     i = 0;
     size_t ui = 0;

-    while (i < len) {
+    while ((int)i < len) {

         unsigned char uch = (unsigned char)s[i];
         positions[i++] = tpos[ui];
         if (uch >= 0x80) {
         unsigned char uch = (unsigned char)s[i];
         positions[i++] = tpos[ui];
         if (uch >= 0x80) {


@@ -1223,6 +1223,22 @@ double ElapsedTime::Duration(bool reset) {
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+#if wxUSE_UNICODE
+wxString stc2wx(const char* str, size_t len)
+{
+    char *buffer=new char[len+1];
+    strncpy(buffer, str, len);
+    buffer[len]=0;
+
+    wxString cstr(buffer, wxConvUTF8);
+
+    delete[] buffer;
+    return cstr;
+}
+#endif
+
+
+

 
 
 
 
 
 

diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in
index 70addc7abbc965c0a1bf532eba0e4136b3904b8f..e1c17422a17d3bec72daf25f7bafdb58bc3c8d57 100644 (file)
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -463,13 +463,14 @@ inline wxString stc2wx(const char* str) {
 #endif
 }
 
 #endif
 }
 

-inline wxString stc2wx(const char* str, size_t len) {

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    return wxString(str, wxConvUTF8, len);
+wxString stc2wx(const char* str, size_t len);

 #else
 #else

+inline wxString stc2wx(const char* str, size_t len) {

     return wxString(str, len);
     return wxString(str, len);

-#endif

 }
 }

+#endif
+

 
 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {
 
 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 2f54e83f76a2af18c90dce9b277da819da102981..a2060dbf888a3d0b370bb9e36c1a5354f1472170 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -2478,13 +2478,14 @@ inline wxString stc2wx(const char* str) {
 #endif
 }
 
 #endif
 }
 

-inline wxString stc2wx(const char* str, size_t len) {

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    return wxString(str, wxConvUTF8, len);
+wxString stc2wx(const char* str, size_t len);

 #else
 #else

+inline wxString stc2wx(const char* str, size_t len) {

     return wxString(str, len);
     return wxString(str, len);

-#endif

 }
 }

+#endif
+

 
 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {
 
 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index eb21c76bb2b8f7ca4340870310cf39acb3ec9feb..98eba98548317d43d6aa1262842000d73456684b 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -481,7 +481,7 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
     // so figure it out and fix it!
     i = 0;
     size_t ui = 0;
     // so figure it out and fix it!
     i = 0;
     size_t ui = 0;

-    while (i < len) {
+    while ((int)i < len) {

         unsigned char uch = (unsigned char)s[i];
         positions[i++] = tpos[ui];
         if (uch >= 0x80) {
         unsigned char uch = (unsigned char)s[i];
         positions[i++] = tpos[ui];
         if (uch >= 0x80) {


@@ -1223,6 +1223,22 @@ double ElapsedTime::Duration(bool reset) {
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+#if wxUSE_UNICODE
+wxString stc2wx(const char* str, size_t len)
+{
+    char *buffer=new char[len+1];
+    strncpy(buffer, str, len);
+    buffer[len]=0;
+
+    wxString cstr(buffer, wxConvUTF8);
+
+    delete[] buffer;
+    return cstr;
+}
+#endif
+
+
+

 
 
 
 
 
 

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 70addc7abbc965c0a1bf532eba0e4136b3904b8f..e1c17422a17d3bec72daf25f7bafdb58bc3c8d57 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -463,13 +463,14 @@ inline wxString stc2wx(const char* str) {
 #endif
 }
 
 #endif
 }
 

-inline wxString stc2wx(const char* str, size_t len) {

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    return wxString(str, wxConvUTF8, len);
+wxString stc2wx(const char* str, size_t len);

 #else
 #else

+inline wxString stc2wx(const char* str, size_t len) {

     return wxString(str, len);
     return wxString(str, len);

-#endif

 }
 }

+#endif
+

 
 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {
 
 #if wxUSE_UNICODE
 inline const wxWX2MBbuf wx2stc(const wxString& str) {