use best size instead of hard coded 80*26 in SetSize(wxSIZE_AUTO)

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index e3327c909a317f18a071e3f4bcbd2fdc838878fe..6fbf324fbf9ed216acb5441068b3e66b19043279 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
 #include <stdlib.h>
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:

-#ifdef __BORLANDC__
+#if defined( __BORLANDC__ ) || defined(__DARWIN__)

 #include "../common/unictabl.inc"
 #else
 #include "unictabl.inc"
 #include "../common/unictabl.inc"
 #else
 #include "unictabl.inc"


@@ -44,9 +44,9 @@ typedef char tchar;
 
 #ifdef __WXMAC__
 
 
 #ifdef __WXMAC__
 

-#include "ATSUnicode.h"
-#include "TextCommon.h"
-#include "TextEncodingConverter.h"
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>

 
 #include "wx/fontutil.h"
 #include "wx/mac/private.h"  // includes mac headers
 
 #include "wx/fontutil.h"
 #include "wx/mac/private.h"  // includes mac headers


@@ -71,7 +71,7 @@ static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
            char s[2] ;
            s[1] = 0 ;
            ByteCount byteInLen, byteOutLen ;
            char s[2] ;
            s[1] = 0 ;
            ByteCount byteInLen, byteOutLen ;

-           for( char c = 255 ; c >= 128 ; --c )
+           for( unsigned char c = 255 ; c >= 128 ; --c )

            {
                s[0] = c ;
                 status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen,
            {
                s[0] = c ;
                 status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen,