RTTI and exceptions settings for WinCE are restored.

[wxWidgets.git] / src / mac / carbon / dccg.cpp

diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp
index f73b9be63b02e0b2766b3a4245b533916e47ab4f..c5ed4a9bae8784b147c3c356935f04d1b1e68955 100755 (executable)
--- a/src/mac/carbon/dccg.cpp
+++ b/src/mac/carbon/dccg.cpp
@@ -40,9 +40,7 @@ using namespace std ;
 #include <FixMath.h>
 #include <CGContext.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
 
 //-----------------------------------------------------------------------------
 // constants
@@ -1296,7 +1294,7 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
     UniCharCount chars = str.Length() ;
     UniChar* ubuf = NULL ;
 #if SIZEOF_WCHAR_T == 4
-       wxMBConvUTF16BE converter ;
+       wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE
        size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
        ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
@@ -1325,10 +1323,11 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 
     wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") );
-    int iAngle = int( angle );
     
-
+    status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ;
+    wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
     
+    int iAngle = int( angle );
     if ( abs(iAngle) > 0 )
     {
         Fixed atsuAngle = IntToFixed( iAngle ) ;
@@ -1455,7 +1454,7 @@ void  wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
     UniCharCount chars = str.Length() ;
     UniChar* ubuf = NULL ;
 #if SIZEOF_WCHAR_T == 4
-       wxMBConvUTF16BE converter ;
+       wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE
        size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
        ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
@@ -1527,7 +1526,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     UniCharCount chars = text.Length() ;
     UniChar* ubuf = NULL ;
 #if SIZEOF_WCHAR_T == 4
-    wxMBConvUTF16BE converter ;
+    wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE
     size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 ) ;
     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
@@ -1602,7 +1601,7 @@ void  wxDC::Clear(void)
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
                     if ( HIThemeSetFill != 0 )
                     {
-                        HIThemeSetFill( m_backgroundBrush.MacGetTheme() , cg ) ;
+                        HIThemeSetFill( m_backgroundBrush.MacGetTheme() , NULL , cg , kHIThemeOrientationNormal ) ;
                         CGContextFillRect(cg, rect);
 
                     }