combobox buglet when inserting item

[wxWidgets.git] / src / msw / ole / automtn.cpp

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 4d062412c75652f7c243fe24c42f682e8ad783aa..108c2948b0a47cf246d54ef0a8bb19b6a095e922 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -539,7 +539,8 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
     else if (type == "bool")
     {
         oleVariant.vt = VT_BOOL;
     else if (type == "bool")
     {
         oleVariant.vt = VT_BOOL;

-#ifdef __WATCOMC__
+        // 'bool' required for VC++ 4 apparently
+#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000))

         oleVariant.bool = variant.GetBool();
 #else
         oleVariant.boolVal = variant.GetBool();
         oleVariant.bool = variant.GetBool();
 #else
         oleVariant.boolVal = variant.GetBool();


@@ -765,7 +766,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];