mbstowcs hack for CodeWarrior's MSL

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

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 4d062412c75652f7c243fe24c42f682e8ad783aa..f72ecea359d7aded0b2b75b2dbdd82ff617d518e 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -765,7 +765,11 @@ BasicString::BasicString(const char *sz)
 {
   // get the size of required buffer
   UINT lenAnsi = strlen(sz);
 {
   // get the size of required buffer
   UINT lenAnsi = strlen(sz);

+  #ifdef __MWERKS__
+  UINT lenWide = lenAnsi * 2 ;
+  #else

   UINT lenWide = mbstowcs(NULL, sz, lenAnsi);
   UINT lenWide = mbstowcs(NULL, sz, lenAnsi);

+  #endif

 
   if ( lenWide > 0 ) {
     m_wzBuf = new OLECHAR[lenWide + 1];
 
   if ( lenWide > 0 ) {
     m_wzBuf = new OLECHAR[lenWide + 1];

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index d83469d6a6f106f1c9e61795d088ad709052979f..5f26caa4135d376db5bcc6a76bb5234c8d5a2722 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -374,8 +374,12 @@ bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam),
             // FIXME this is a temp hack only until I understand better what
             //       must be done in both ANSI and Unicode builds
             size_t lenAnsi = tool->m_shortHelpString.Len();
             // FIXME this is a temp hack only until I understand better what
             //       must be done in both ANSI and Unicode builds
             size_t lenAnsi = tool->m_shortHelpString.Len();

+            #ifdef __MWERKS__
+            wchar_t *pwz = new wchar_t[lenAnsi * 2 + 1];
+            #else

             size_t lenUnicode = mbstowcs(NULL, tool->m_shortHelpString, lenAnsi);
             wchar_t *pwz = new wchar_t[lenUnicode + 1];
             size_t lenUnicode = mbstowcs(NULL, tool->m_shortHelpString, lenAnsi);
             wchar_t *pwz = new wchar_t[lenUnicode + 1];

+            #endif

             mbstowcs(pwz, tool->m_shortHelpString, lenAnsi + 1);
             memcpy(ttText->szText, pwz,
                    (sizeof(ttText->szText) - 1)/sizeof(ttText->szText[0]));
             mbstowcs(pwz, tool->m_shortHelpString, lenAnsi + 1);
             memcpy(ttText->szText, pwz,
                    (sizeof(ttText->szText) - 1)/sizeof(ttText->szText[0]));