wxBUFFER_DC_DEFAULT should be wxBUFFER_DC_OVERWRITE_BG, not PRESERVE

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index ea5e74110f648a6aed805f74228087d5744c9cc2..6363e4001c9d5aa0e05599c0f2a8794078144996 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1232,15 +1232,15 @@ public:
            OSStatus status = noErr ;
            ByteCount byteOutLen ;
            ByteCount byteInLen = strlen(psz) ;
            OSStatus status = noErr ;
            ByteCount byteOutLen ;
            ByteCount byteInLen = strlen(psz) ;

-           ByteCount byteBufferLen = n ; 

                wchar_t *tbuf = NULL ;
                
                if (buf == NULL)
                {
                wchar_t *tbuf = NULL ;
                
                if (buf == NULL)
                {

-                       n = byteInLen * SIZEOF_WCHAR_T ;
-                       tbuf = (wchar_t*) malloc( n ) ;
+                       n = byteInLen ;
+                       tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ;

                }
        
                }
        

+           ByteCount byteBufferLen = n * SIZEOF_WCHAR_T ; 

            status = TECConvertText(m_MB2WC_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
              (TextPtr) (buf ? buf : tbuf) , byteBufferLen, &byteOutLen);
 
            status = TECConvertText(m_MB2WC_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
              (TextPtr) (buf ? buf : tbuf) , byteBufferLen, &byteOutLen);
 


@@ -1259,16 +1259,17 @@ public:
            OSStatus status = noErr ;
            ByteCount byteOutLen ;
            ByteCount byteInLen = wxWcslen(psz) * SIZEOF_WCHAR_T ;
            OSStatus status = noErr ;
            ByteCount byteOutLen ;
            ByteCount byteInLen = wxWcslen(psz) * SIZEOF_WCHAR_T ;

-           ByteCount byteBufferLen = n ;

 
                char *tbuf = NULL ;
                
                if (buf == NULL)
                {
 
                char *tbuf = NULL ;
                
                if (buf == NULL)
                {

-                       n = byteInLen ;
+                       // worst case
+                       n = byteInLen * 2 ;

                        tbuf = (char*) malloc( n ) ;
                }
 
                        tbuf = (char*) malloc( n ) ;
                }
 

+           ByteCount byteBufferLen = n ;

            status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
               (TextPtr) ( buf ? buf : tbuf ) , byteBufferLen, &byteOutLen);
 
            status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
               (TextPtr) ( buf ? buf : tbuf ) , byteBufferLen, &byteOutLen);