X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a0d76bc6f563c53fb412dfec51b6a5a72c9a2ce..e7e1b01eb55e59e555860c7ce181f176b8bbf4e2:/src/common/strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index c0dbf63459..4a7c55d033 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -37,6 +37,25 @@
 #include <string.h>
 #include <stdlib.h>
 
+
+#include "wx/debug.h"
+#include "wx/strconv.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+#if wxUSE_WCHAR_T
+
 #ifdef __SALFORDC__
   #include <clib.h>
 #endif
@@ -49,11 +68,6 @@
   #include <windows.h>
 #endif
 
-#include "wx/debug.h"
-#include "wx/strconv.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-
 #define BSWAP_UCS4(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT32_SWAP_ALWAYS(str[_c]); }
 #define BSWAP_UTF16(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT16_SWAP_ALWAYS(str[_c]); }
 
@@ -85,17 +99,6 @@
     #error "Weird sizeof(wchar_t): please report your platform details to wx-users mailing list"
 #endif
 
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-#if wxUSE_WCHAR_T
 
 #ifdef WC_UTF16
 
@@ -638,7 +641,7 @@ public:
         size_t outbuf = n;
         size_t res, cres;
         
-        wchar_t *tmpbuf;
+        wchar_t *tmpbuf = 0;
 
         if (g_wcNeedsSwap)
         {
@@ -761,7 +764,8 @@ public:
 
     size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
     {
-#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
         size_t inbuf = std::wcslen(psz);
 #else
         size_t inbuf = ::wcslen(psz);
@@ -895,7 +899,8 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
         return m_cset->WC2MB(buf, psz, n);
 
     // latin-1 (direct)
-#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
     size_t len=std::wcslen(psz);
 #else
     size_t len=::wcslen(psz);