Committing in .

 Patches for OpenVMS

 Modified Files:
 	wxWidgets/src/common/descrip.mms
 	wxWidgets/src/common/strconv.cpp
----------------------------------------------------------------------

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index b76258d929b4a03103275577969763695292fd56..ac7d287049e38c15b6643b1b4deb85c3bc976376 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -162,6 +162,7 @@ OBJECTS1=fs_inet.obj,\
 
 OBJECTS2=utilscmn.obj,\
                rgncmn.obj,\
+               uri.obj,\
                valgen.obj,\
                validate.obj,\
                valtext.obj,\
@@ -323,6 +324,7 @@ SOURCES = \
                radiocmn.cpp,\
                regex.cpp,\
                taskbarcmn.cpp,\
+               uri.cpp,\
                xti.cpp,\
                xtistrm.cpp,\
                xtixml.cpp
@@ -498,3 +500,4 @@ taskbarcmn.obj : taskbarcmn.cpp
 xti.obj : xti.cpp
 xtistrm.obj : xtistrm.cpp
 xtixml.obj : xtixml.cpp
+uri.obj : uri.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 3e8a373222301de384d05120f1e6f0cd1cc8df95..c93bcc313222a6f54925226419d973d4eb11e21b 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -473,8 +473,12 @@ size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t
             len++;
         }
 #ifndef WC_UTF16
-        else if (cc > ((const wchar_t)0xffff))
-        {
+#ifdef __VMS
+       else if (cc > 0xffff)
+#else
+       else if (cc > ((const wchar_t)0xffff))
+#endif
+        {
             // no surrogate pair generation (yet?)
             return (size_t)-1;
         }