fix for assert when setting tooltip for a readonly combo

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index baed36b0013ad80b2209b147d9c5b1dd20c14a36..d85340b8775d7a6cab567d7166a3ab8700e2d08f 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -87,6 +87,8 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
 
 #if wxUSE_WCHAR_T
 
 
 #if wxUSE_WCHAR_T
 

+#ifdef WC_UTF16
+

 static size_t encode_utf16(wxUint32 input,wxUint16*output)
 {
   if (input<=0xffff) {
 static size_t encode_utf16(wxUint32 input,wxUint16*output)
 {
   if (input<=0xffff) {


@@ -119,6 +121,8 @@ static size_t decode_utf16(wxUint16*input,wxUint32&output)
   }
 }
 
   }
 }
 

+#endif // WC_UTF16
+

 // ----------------------------------------------------------------------------
 // wxMBConv
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMBConv
 // ----------------------------------------------------------------------------