X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b34039cf55bc7cb87cedf396f60396e2f8fc0d62..202848fe9e424cd3a9fa9a23ff7e6fdd78dbe4cf:/src/mac/dc.cpp

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 95d6293c85..206e960450 100644
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -19,6 +19,7 @@
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/image.h"
+#include "wx/log.h"
 
 
 #if __MSL__ >= 0x6000
@@ -27,7 +28,9 @@ using namespace std ;
 #endif
 
 #include "wx/mac/private.h"
-
+#include "ATSUnicode.h"
+#include "TextCommon.h"
+#include "TextEncodingConverter.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
@@ -50,7 +53,51 @@ const double RAD2DEG  = 180.0 / M_PI;
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;
 
-#define wxMAC_EXPERIMENTAL_PATTERN 0
+wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
+	m_ph( (GrafPtr) dc->m_macPort )
+{
+	wxASSERT( dc->Ok() ) ;
+	m_dc = dc ;
+	dc->MacSetupPort(&m_ph) ;
+}
+
+wxMacPortSetter::~wxMacPortSetter()
+{
+	m_dc->MacCleanupPort(&m_ph) ;
+}
+
+wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) 
+{
+    m_formerClip = NewRgn() ;
+    m_newClip = NewRgn() ;
+    GetClip( m_formerClip ) ;
+    
+    if ( win )
+    {
+        RgnHandle insidergn = NewRgn() ;
+        int x = 0 , y = 0;
+        wxWindow *parent = win->GetParent() ;
+        parent->MacWindowToRootWindow( &x,&y ) ;
+
+        wxSize size = parent->GetSize() ;
+        SetRectRgn( insidergn , parent->MacGetLeftBorderSize() , parent->MacGetTopBorderSize() , 
+      	  size.x - parent->MacGetLeftBorderSize() - parent->MacGetRightBorderSize(), 
+      	  size.y - parent->MacGetTopBorderSize() - parent->MacGetBottomBorderSize()) ;
+
+        CopyRgn( (RgnHandle) parent->MacGetVisibleRegion(false).GetWXHRGN() , m_newClip ) ;
+    	SectRgn( m_newClip , insidergn , m_newClip ) ;
+        OffsetRgn( m_newClip , x , y ) ;
+        SetClip( m_newClip ) ;
+    	DisposeRgn( insidergn ) ;
+	}
+}
+
+wxMacWindowClipper::~wxMacWindowClipper() 
+{
+    SetClip( m_formerClip ) ;
+	DisposeRgn( m_newClip ) ;
+	DisposeRgn( m_formerClip ) ;
+}
 
 //-----------------------------------------------------------------------------
 // Local functions
@@ -157,33 +204,33 @@ wxDC::wxDC()
 {
   m_ok = FALSE;
   m_colour = TRUE;
-  
+
   m_mm_to_pix_x = mm2pt;
   m_mm_to_pix_y = mm2pt;
-  
+
   m_internalDeviceOriginX = 0;
   m_internalDeviceOriginY = 0;
   m_externalDeviceOriginX = 0;
   m_externalDeviceOriginY = 0;
-  
+
   m_logicalScaleX = 1.0;
   m_logicalScaleY = 1.0;
   m_userScaleX = 1.0;
   m_userScaleY = 1.0;
   m_scaleX = 1.0;
   m_scaleY = 1.0;
-  
+
   m_needComputeScaleX = FALSE;
   m_needComputeScaleY = FALSE;
-  
+
   m_macPort = NULL ;
   m_macMask = NULL ;
   m_ok = FALSE ;
-  
+
 	m_macFontInstalled = false ;
 	m_macBrushInstalled = false ;
 	m_macPenInstalled = false ;
-	
+
 	m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ;
 	m_macBoundaryClipRgn = NewRgn() ;
 	m_macCurrentClipRgn = NewRgn() ;
@@ -194,17 +241,11 @@ wxDC::wxDC()
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
     m_brush = *wxWHITE_BRUSH;
-}
-wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
-	m_ph( (GrafPtr) dc->m_macPort ) 
-{
-	wxASSERT( dc->Ok() ) ;
-	
-	dc->MacSetupPort(&m_ph) ;
-}
-
-wxMacPortSetter::~wxMacPortSetter() 
-{
+    m_macCurrentPortStateHelper = NULL ;
+    m_macATSUIStyle = NULL ;
+    m_macAliasWasEnabled = false;
+    m_macForegroundPixMap = NULL ;
+    m_macBackgroundPixMap = NULL ;
 }
 
 wxDC::~wxDC(void)
@@ -214,28 +255,60 @@ wxDC::~wxDC(void)
 }
 void wxDC::MacSetupPort(wxMacPortStateHelper* help) const
 {
+    wxASSERT( m_macCurrentPortStateHelper == NULL ) ;
+    m_macCurrentPortStateHelper = help ;
 	SetClip( (RgnHandle) m_macCurrentClipRgn);
 
 	m_macFontInstalled = false ;
 	m_macBrushInstalled = false ;
-	m_macPenInstalled = false ;	
+	m_macPenInstalled = false ;
+}
+
+void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const
+{
+    wxASSERT( m_macCurrentPortStateHelper == help ) ;
+    m_macCurrentPortStateHelper = NULL ;
+    if( m_macATSUIStyle )
+    {
+        ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle);
+        m_macATSUIStyle = NULL ;
+    }
+    if ( m_macAliasWasEnabled )
+    {
+        SetAntiAliasedTextEnabled(m_macFormerAliasState, m_macFormerAliasSize);
+        m_macAliasWasEnabled = false ;
+    }
+    if ( m_macForegroundPixMap )
+    {
+        Pattern blackColor ;
+        ::PenPat(GetQDGlobalsBlack(&blackColor));
+        DisposePixPat( (PixPatHandle) m_macForegroundPixMap ) ;
+        m_macForegroundPixMap = NULL ;
+    }
+    if ( m_macBackgroundPixMap )
+    {
+        Pattern whiteColor ;
+        ::BackPat(GetQDGlobalsWhite(&whiteColor));
+        DisposePixPat( (PixPatHandle) m_macBackgroundPixMap ) ;
+        m_macBackgroundPixMap = NULL ;
+    }
 }
 
 void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
 {
      wxCHECK_RET( Ok(), wxT("invalid window dc") );
- 
+
      wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") );
- 
+
      wxMacPortSetter helper(this) ;
- 
+
      wxCoord xx = XLOG2DEVMAC(x);
      wxCoord yy = YLOG2DEVMAC(y);
      wxCoord w = bmp.GetWidth();
      wxCoord h = bmp.GetHeight();
      wxCoord ww = XLOG2DEVREL(w);
      wxCoord hh = YLOG2DEVREL(h);
- 
+
      // Set up drawing mode
      short  mode = (m_logicalFunction == wxCOPY ? srcCopy :
                     //m_logicalFunction == wxCLEAR ? WHITENESS :
@@ -250,7 +323,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
                     //m_logicalFunction == wxSRC_OR ? srcOr :
                     //m_logicalFunction == wxSRC_AND ? SRCAND :
                     srcCopy );
- 
+
      if ( bmp.GetBitmapType() == kMacBitmapTypePict ) {
          Rect bitmaprect = { 0 , 0 , hh, ww };
          ::OffsetRect( &bitmaprect, xx, yy ) ;
@@ -260,7 +333,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
      {
          GWorldPtr    bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP() );
          PixMapHandle bmappixels ;
- 
+
          // Set foreground and background colours (for bitmaps depth = 1)
          if(bmp.GetDepth() == 1)
         {
@@ -276,15 +349,15 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
              RGBForeColor( &black ) ;
              RGBBackColor( &white ) ;
          }
- 
+
          bmappixels = GetGWorldPixMap( bmapworld ) ;
- 
+
          wxCHECK_RET(LockPixels(bmappixels),
                      wxT("DoDrawBitmap:  Unable to lock pixels"));
- 
+
          Rect source = { 0, 0, h, w };
          Rect dest   = { yy, xx, yy + hh, xx + ww };
- 
+
          if ( useMask && bmp.GetMask() )
          {
              if( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap()))))
@@ -321,9 +394,9 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 {
      wxCHECK_RET(Ok(), wxT("Invalid dc  wxDC::DoDrawIcon"));
- 
+
      wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon"));
- 
+
     DoDrawBitmap( icon , x , y , icon.GetMask() != NULL ) ;
 }
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
@@ -338,7 +411,7 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 
     SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ;
     SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
-    
+
     if( m_clipping )
     {
         m_clipX1 = wxMax( m_clipX1 , xx );
@@ -415,7 +488,7 @@ void wxDC::DestroyClippingRegion()
   wxMacPortSetter helper(this) ;
   CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
   m_clipping = FALSE;
-}    
+}
 void wxDC::DoGetSize( int* width, int* height ) const
 {
   *width = m_maxX-m_minX;
@@ -443,7 +516,7 @@ void wxDC::SetTextBackground( const wxColour &col )
 }
 void wxDC::SetMapMode( int mode )
 {
-  switch (mode) 
+  switch (mode)
   {
     case wxMM_TWIPS:
       SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
@@ -522,7 +595,11 @@ wxSize wxDC::GetPPI() const
 
 int wxDC::GetDepth() const
 {
-	return wxDisplayDepth() ;
+    if ( IsPortColor( (CGrafPtr) m_macPort ) )
+    {
+        return ( (**GetPortPixMap( (CGrafPtr) m_macPort)).pixelSize ) ;
+    }
+    return 1 ;
 }
 
 void wxDC::ComputeScaleAndOrigin()
@@ -537,7 +614,7 @@ void wxDC::ComputeScaleAndOrigin()
   m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX;
   m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY;
 
-  // CMB: if scale has changed call SetPen to recalulate the line width 
+  // CMB: if scale has changed call SetPen to recalulate the line width
   if (m_scaleX != origScaleX || m_scaleY != origScaleY)
   {
     // this is a bit artificial, but we need to force wxDC to think
@@ -567,7 +644,7 @@ void  wxDC::SetPen( const wxPen &pen )
 {
 	if ( m_pen == pen )
 		return ;
-		
+
   m_pen = pen;
 
   m_macPenInstalled = false ;
@@ -575,28 +652,28 @@ void  wxDC::SetPen( const wxPen &pen )
 
 void  wxDC::SetBrush( const wxBrush &brush )
 {
-  if (m_brush == brush) 
+  if (m_brush == brush)
   	return;
-  
+
   m_brush = brush;
   m_macBrushInstalled = false ;
 }
 
 void  wxDC::SetBackground( const wxBrush &brush )
 {
-  if (m_backgroundBrush == brush) 
+  if (m_backgroundBrush == brush)
   	return;
-  
+
   m_backgroundBrush = brush;
-  
-  if (!m_backgroundBrush.Ok()) 
+
+  if (!m_backgroundBrush.Ok())
   	return;
    m_macBrushInstalled = false ;
 }
 
 void  wxDC::SetLogicalFunction( int function )
 {
- 	if (m_logicalFunction == function) 
+ 	if (m_logicalFunction == function)
  		return;
 
 	m_logicalFunction = function ;
@@ -605,12 +682,16 @@ void  wxDC::SetLogicalFunction( int function )
 	m_macPenInstalled = false ;
 }
 
-void  wxDC::DoFloodFill( wxCoord x, wxCoord y, const wxColour& col,
-                             int style )
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+                          const wxColour & col, int style);
+
+bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
+                       const wxColour& col, int style)
 {
+    return wxDoFloodFill(this, x, y, col, style);
 }
 
-bool  wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const 
+bool  wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const
 {
     wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel  Invalid DC") );
     wxMacPortSetter helper(this) ;
@@ -630,9 +711,9 @@ bool  wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const
 void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
-  	
+
   wxMacPortSetter helper(this) ;
-  
+
   if (m_pen.GetStyle() != wxTRANSPARENT)
   {
 		MacInstallPen() ;
@@ -664,7 +745,7 @@ void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
     	 	    	xx2++;
     	 	}
     	}
-    	
+
 		::MoveTo(xx1, yy1);
 		::LineTo(xx2, yy2);
   }
@@ -673,6 +754,7 @@ void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 void  wxDC::DoCrossHair( wxCoord x, wxCoord y )
 {
     wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair  Invalid window dc") );
+    wxMacPortSetter helper(this) ;
 
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {
@@ -687,6 +769,10 @@ void  wxDC::DoCrossHair( wxCoord x, wxCoord y )
         ::LineTo( XLOG2DEVMAC(w), yy );
         ::MoveTo( xx, YLOG2DEVMAC(0) );
         ::LineTo( xx, YLOG2DEVMAC(h) );
+
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x+w, y+h);
+
     }
 }
 
@@ -730,6 +816,7 @@ void  wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
                            wxCoord xc, wxCoord yc )
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc  Invalid DC"));
+    wxMacPortSetter helper(this) ;
 
     wxCoord xx1 = XLOG2DEVMAC(x1);
     wxCoord yy1 = YLOG2DEVMAC(y1);
@@ -783,10 +870,11 @@ void  wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                                    double sa, double ea )
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc  Invalid DC"));
+    wxMacPortSetter helper(this) ;
 
     Rect r;
     double angle = sa - ea;  // Order important Mac in opposite direction to wx
- 
+
     wxCoord xx = XLOG2DEVMAC(x);
     wxCoord yy = YLOG2DEVMAC(y);
     wxCoord ww = m_signX * XLOG2DEVREL(w);
@@ -816,17 +904,16 @@ void  wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
 void  wxDC::DoDrawPoint( wxCoord x, wxCoord y )
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
-  	
+
   wxMacPortSetter helper(this) ;
-  
-  if (m_pen.GetStyle() != wxTRANSPARENT) 
+
+  if (m_pen.GetStyle() != wxTRANSPARENT)
   {
-		MacInstallPen() ;
-        wxCoord xx1 = XLOG2DEVMAC(x); 
+        wxCoord xx1 = XLOG2DEVMAC(x);
         wxCoord yy1 = YLOG2DEVMAC(y);
-	
-		::MoveTo(xx1,yy1);
-		::LineTo(xx1+1, yy1+1);
+        RGBColor pencolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel());
+        ::SetCPixel( xx1,yy1,&pencolor) ;
+        CalcBoundingBox(x, y);
   }
 }
 
@@ -835,20 +922,20 @@ void  wxDC::DoDrawLines(int n, wxPoint points[],
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
   wxMacPortSetter helper(this) ;
-  
-  if (m_pen.GetStyle() == wxTRANSPARENT) 
+
+  if (m_pen.GetStyle() == wxTRANSPARENT)
   	return;
 
   MacInstallPen() ;
-  
+
   wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
                       m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ;
 
   wxCoord x1, x2 , y1 , y2 ;
   x1 = XLOG2DEVMAC(points[0].x + xoffset);
-  y1 = YLOG2DEVMAC(points[0].y + yoffset);   
+  y1 = YLOG2DEVMAC(points[0].y + yoffset);
   ::MoveTo(x1 - offset, y1 - offset );
-  
+
   for (int i = 0; i < n-1; i++)
   {
     x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
@@ -858,21 +945,21 @@ void  wxDC::DoDrawLines(int n, wxPoint points[],
 }
 
 void  wxDC::DoDrawPolygon(int n, wxPoint points[],
-                               wxCoord xoffset, wxCoord yoffset,
-                               int fillStyle )
+                          wxCoord xoffset, wxCoord yoffset,
+                          int fillStyle )
 {
   	wxCHECK_RET(Ok(), wxT("Invalid DC"));
   	wxMacPortSetter helper(this) ;
-  	
+
   	wxCoord x1, x2 , y1 , y2 ;
-  
+
     if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
         return ;
-        
+
 	PolyHandle polygon = OpenPoly();
-	
+
 	x1 = XLOG2DEVMAC(points[0].x + xoffset);
-	y1 = YLOG2DEVMAC(points[0].y + yoffset);   
+	y1 = YLOG2DEVMAC(points[0].y + yoffset);
 	::MoveTo(x1,y1);
 
 	for (int i = 1; i < n; i++)
@@ -887,7 +974,7 @@ void  wxDC::DoDrawPolygon(int n, wxPoint points[],
     {
         ::LineTo(x1,y1 ) ;
     }
-    
+
 	ClosePoly();
 
   	if (m_brush.GetStyle() != wxTRANSPARENT)
@@ -895,15 +982,15 @@ void  wxDC::DoDrawPolygon(int n, wxPoint points[],
 
 		MacInstallBrush();
 		::PaintPoly( polygon );
-		
+
 	}
-	
-	if (m_pen.GetStyle() != wxTRANSPARENT) 
+
+	if (m_pen.GetStyle() != wxTRANSPARENT)
 	{
-	
+
 		MacInstallPen() ;
 		::FramePoly( polygon ) ;
-		
+
 	}
 	KillPoly( polygon );
 }
@@ -917,33 +1004,33 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 	wxCoord yy = YLOG2DEVMAC(y);
 	wxCoord ww = m_signX * XLOG2DEVREL(width);
 	wxCoord hh = m_signY * YLOG2DEVREL(height);
-	
+
 	// CMB: draw nothing if transformed w or h is 0
-	if (ww == 0 || hh == 0) 
+	if (ww == 0 || hh == 0)
 		return;
-	
+
 	// CMB: handle -ve width and/or height
-	if (ww < 0) 
-	{ 
-		ww = -ww; 
-		xx = xx - ww; 
+	if (ww < 0)
+	{
+		ww = -ww;
+		xx = xx - ww;
 	}
-	
-	if (hh < 0) 
-	{ 
-		hh = -hh; 
-		yy = yy - hh; 
+
+	if (hh < 0)
+	{
+		hh = -hh;
+		yy = yy - hh;
 	}
-	
+
 	Rect rect = { yy , xx , yy + hh , xx + ww } ;
-	
-	if (m_brush.GetStyle() != wxTRANSPARENT) 
+
+	if (m_brush.GetStyle() != wxTRANSPARENT)
 	{
 		MacInstallBrush() ;
 		::PaintRect( &rect ) ;
 	}
-	
-	if (m_pen.GetStyle() != wxTRANSPARENT) 
+
+	if (m_pen.GetStyle() != wxTRANSPARENT)
 	{
 		MacInstallPen() ;
 		::FrameRect( &rect ) ;
@@ -956,41 +1043,41 @@ void  wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
     wxMacPortSetter helper(this) ;
-	
-    if (radius < 0.0) 
+
+    if (radius < 0.0)
   	    radius = - radius * ((width < height) ? width : height);
-	
+
 	wxCoord xx = XLOG2DEVMAC(x);
 	wxCoord yy = YLOG2DEVMAC(y);
 	wxCoord ww = m_signX * XLOG2DEVREL(width);
 	wxCoord hh = m_signY * YLOG2DEVREL(height);
-	
+
 	// CMB: draw nothing if transformed w or h is 0
-	if (ww == 0 || hh == 0) 
+	if (ww == 0 || hh == 0)
 		return;
-	
+
 	// CMB: handle -ve width and/or height
-	if (ww < 0) 
-	{ 
-		ww = -ww; 
-		xx = xx - ww; 
+	if (ww < 0)
+	{
+		ww = -ww;
+		xx = xx - ww;
 	}
-	
-	if (hh < 0) 
-	{ 
-		hh = -hh; 
-		yy = yy - hh; 
+
+	if (hh < 0)
+	{
+		hh = -hh;
+		yy = yy - hh;
 	}
-	
+
 	Rect rect = { yy , xx , yy + hh , xx + ww } ;
-	
-	if (m_brush.GetStyle() != wxTRANSPARENT) 
+
+	if (m_brush.GetStyle() != wxTRANSPARENT)
 	{
 		MacInstallBrush() ;
 		::PaintRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ;
 	}
-	
-	if (m_pen.GetStyle() != wxTRANSPARENT) 
+
+	if (m_pen.GetStyle() != wxTRANSPARENT)
 	{
 		MacInstallPen() ;
 		::FrameRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ;
@@ -1040,8 +1127,8 @@ void  wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 }
 
 
-    
-bool  wxDC::CanDrawBitmap(void) const 
+
+bool  wxDC::CanDrawBitmap(void) const
 {
 	return true ;
 }
@@ -1053,7 +1140,7 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 {
     wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc"));
     wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit  Illegal source DC"));
-    
+
     if ( logical_func == wxNO_OP )
         return TRUE ;
 
@@ -1063,10 +1150,10 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     }
 
     // correct the parameter in case this dc does not have a mask at all
-    
+
     if ( useMask && !source->m_macMask )
         useMask = false ;
-        
+
 	Rect srcrect , dstrect ;
 	srcrect.top = source->YLOG2DEVMAC(ysrc) ;
 	srcrect.left = source->XLOG2DEVMAC(xsrc)  ;
@@ -1089,10 +1176,10 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 		    break ;
 		case wxAND_REVERSE:// src AND (NOT dst)
 		    invertDestinationFirst = true ;
-		    mode = srcOr ; 
+		    mode = srcOr ;
 		    break ;
 		case wxCLEAR:      // 0
-		    mode = kEmulatedMode ; 
+		    mode = kEmulatedMode ;
 		    break ;
         case wxCOPY:       // src
 			mode = srcCopy ; // ok
@@ -1105,11 +1192,11 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 			break ;
 		case wxNAND:       // (NOT src) OR (NOT dst)
 		    invertDestinationFirst = true ;
-		    mode = srcBic ; 
+		    mode = srcBic ;
 		    break ;
 		case wxNOR:        // (NOT src) AND (NOT dst)
 		    invertDestinationFirst = true ;
-		    mode = notSrcOr ; 
+		    mode = notSrcOr ;
 		    break ;
 		case wxNO_OP:      // dst
 		    mode = kEmulatedMode ; // this has already been handled upon entry
@@ -1118,14 +1205,14 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 		    mode = notSrcBic ;
 		    break ;
 		case wxOR_INVERT:  // (NOT src) OR dst
-		    mode = srcBic ; 
+		    mode = srcBic ;
 		    break ;
 		case wxOR_REVERSE: // src OR (NOT dst)
 		    invertDestinationFirst = true ;
 			mode = notSrcBic ;
 			break ;
 		case wxSET:        // 1
-		    mode = kEmulatedMode ; 
+		    mode = kEmulatedMode ;
 		    break ;
 		case wxSRC_INVERT: // (NOT src)
 			mode = notSrcCopy ; // ok
@@ -1141,17 +1228,16 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 
     if ( mode == kUnsupportedMode )
     {
-        wxFAIL_MSG("unsupported blitting mode" )
+        wxFAIL_MSG("unsupported blitting mode" );
         return FALSE ;
     }
-    
+
 	CGrafPtr			sourcePort = (CGrafPtr) source->m_macPort ;
-	PixMapHandle	bmappixels =  GetGWorldPixMap( sourcePort ) ; 
+	PixMapHandle	bmappixels =  GetGWorldPixMap( sourcePort ) ;
 	if ( LockPixels(bmappixels) )
 	{
         wxMacPortSetter helper(this) ;
-        RGBColor tempColor ;
-    
+
     	if ( source->GetDepth() == 1 )
     	{
     	    RGBForeColor( &MAC_WXCOLORREF(m_textForegroundColour.GetPixel()) ) ;
@@ -1172,8 +1258,8 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 		    {
     			if ( LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) )
     			{
-    				CopyMask( GetPortBitMapForCopyBits( sourcePort ) , 
-    				            GetPortBitMapForCopyBits( MAC_WXHBITMAP(source->m_macMask) ) , 
+    				CopyMask( GetPortBitMapForCopyBits( sourcePort ) ,
+    				            GetPortBitMapForCopyBits( MAC_WXHBITMAP(source->m_macMask) ) ,
     				            GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
     					        &srcrect, &srcrect , &dstrect ) ;
     				UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) )  ) ;
@@ -1218,18 +1304,17 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                                 {
                                     RGBColor srcColor ;
                                     RGBColor dstColor ;
-                                    
+
                                     SetPort( (GrafPtr) sourcePort ) ;
                                     GetCPixel(  srcPoint.h , srcPoint.v , &srcColor) ;
                                     SetPort( (GrafPtr) m_macPort ) ;
                                     GetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
-                                    
+
                                     wxMacCalculateColour( logical_func , srcColor ,  dstColor ) ;
                                     SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
                                 }
                             }
                         }
-                        // wxFAIL_MSG("unimplemented emulated mode") ;
                     }
                 }
                 else
@@ -1238,7 +1323,7 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                     {
                         MacInvertRgn( clipRgn ) ;
                     }
-        			CopyBits( GetPortBitMapForCopyBits( sourcePort ) , 
+        			CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,
         			    GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
         				&srcrect, &dstrect, mode, clipRgn ) ;
         	    }
@@ -1247,137 +1332,165 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 		}
 		else
 		{
+            RgnHandle clipRgn = NewRgn() ;
+            SetRectRgn( clipRgn , dstrect.left , dstrect.top , dstrect.right , dstrect.bottom ) ;
 		    if ( mode == kEmulatedMode )
 		    {
-    			CopyBits( GetPortBitMapForCopyBits( sourcePort ) , 
-    			    GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
-    				&srcrect, &dstrect, mode, NULL ) ;
+                Pattern pat ;
+	            ::PenPat(GetQDGlobalsBlack(&pat));
+                if ( logical_func == wxSET )
+                {
+                    RGBColor col= { 0xFFFF, 0xFFFF, 0xFFFF } ;
+	                ::RGBForeColor( &col  ) ;
+                    ::PaintRgn( clipRgn ) ;
+                }
+                else if ( logical_func == wxCLEAR )
+                {
+                    RGBColor col= { 0x0000, 0x0000, 0x0000 } ;
+	                ::RGBForeColor( &col  ) ;
+                    ::PaintRgn( clipRgn ) ;
+                }
+                else if ( logical_func == wxINVERT )
+                {
+                    MacInvertRgn( clipRgn ) ;
+                }
+                else
+                {
+                    for ( int y = 0 ; y < srcrect.right - srcrect.left ; ++y )
+                    {
+                        for ( int x = 0 ; x < srcrect.bottom - srcrect.top ; ++x )
+                        {
+                            Point dstPoint = { dstrect.top + y , dstrect.left + x } ;
+                            Point srcPoint = { srcrect.top + y , srcrect.left + x } ;
+
+                            {
+                                RGBColor srcColor ;
+                                RGBColor dstColor ;
+
+                                SetPort( (GrafPtr) sourcePort ) ;
+                                GetCPixel(  srcPoint.h , srcPoint.v , &srcColor) ;
+                                SetPort( (GrafPtr) m_macPort ) ;
+                                GetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
+
+                                wxMacCalculateColour( logical_func , srcColor ,  dstColor ) ;
+                                SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
+                            }
+                        }
+                    }
+                }
+
     		}
     		else
     		{
-                    Pattern pat ;
-		            ::PenPat(GetQDGlobalsBlack(&pat));
-                    if ( logical_func == wxSET )
-                    {
-                        RGBColor col= { 0xFFFF, 0xFFFF, 0xFFFF } ;
-		                ::RGBForeColor( &col  ) ;
-                    }
-                    else
-                    {
-                        RGBColor col= { 0x0000, 0x0000, 0x0000 } ;
-		                ::RGBForeColor( &col  ) ;
-                    }
-                    ::PaintRect( &dstrect ) ;
+                if ( invertDestinationFirst )
+                {
+                    MacInvertRgn( clipRgn ) ;
+                }
+    			CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,
+    			    GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
+    				&srcrect, &dstrect, mode, NULL ) ;
     		}
+    		DisposeRgn( clipRgn ) ;
 		}
 		UnlockPixels( bmappixels ) ;
-	} 
-	
+	}
+
 	m_macPenInstalled = false ;
 	m_macBrushInstalled = false ;
 	m_macFontInstalled = false ;
-  	
+
   return TRUE;
 }
 
-void  wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+inline Fixed	IntToFixed( int inInt )
+	{
+		return (((SInt32) inInt) << 16);
+	}
+
+
+void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
                               double angle)
 {
     wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText  Invalid window dc") );
 
-    if (angle == 0.0)
+    if (angle == 0.0 )
     {
-        DrawText(text, x, y);
+        DrawText(str, x, y);
         return;
     }
 
-    MacInstallFont();
-
-    // the size of the text
-    wxCoord w, h;
-    GetTextExtent(text, &w, &h);
-
-    // draw the string normally
-    wxBitmap src(w, h);
-    wxMemoryDC dc;
-    dc.SelectObject(src);
-    dc.SetFont(GetFont());
-    dc.SetBackground(*wxWHITE_BRUSH);
-    dc.SetBrush(*wxBLACK_BRUSH);
-    dc.Clear();
-    dc.DrawText(text, 0, 0);
-    dc.SetFont(wxNullFont);
-    dc.SelectObject(wxNullBitmap);
+    if ( str.Length() == 0 )
+        return ;
 
     wxMacPortSetter helper(this) ;
+    MacInstallFont() ;
 
-    // Calculate the size of the rotated bounding box.
-    double rad = DegToRad(angle);
-    double dx = cos(rad);
-    double dy = sin(rad);
-
-    // the rectngle vertices are counted clockwise with the first one being at
-    // (0, 0) (or, rather, at (x, y))
-    double x2 = w * dx;
-    double y2 = -w * dy;      // y axis points to the bottom, hence minus
-    double x4 = h * dy;
-    double y4 = h * dx;
-    double x3 = x4 + x2;
-    double y3 = y4 + y2;
-
-    // calc max and min
-    wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5);
-    wxCoord maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5);
-    wxCoord minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5);
-    wxCoord minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
- 
-    // prepare to blit-with-rotate the bitmap to the DC
-    wxImage image(src);
-
-    RGBColor colText = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() );
-    RGBColor colBack = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel() );
-
-    unsigned char *data = image.GetData();
-
-    wxCoord dstX, dstY;
-    double r, angleOrig;
-    bool textPixel;
-
-    // paint pixel by pixel
-    for ( wxCoord srcX = 0; srcX < w; srcX++ )
+	wxString text ;
+	if ( wxApp::s_macDefaultEncodingIsPC )
+	{
+		text = wxMacMakeMacStringFromPC( str ) ;
+	}
+	else
+	{
+		text = str ;
+	}
+
+	wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
+    if ( 0 )
     {
-        for ( wxCoord srcY = 0; srcY < h; srcY++ )
-        {
-            // transform source coords to dest coords
-            r         = sqrt( (double)(srcX * srcX + srcY * srcY) );
-            angleOrig = atan2((double)srcY, (double)srcX) - rad;
-            dstX      = (wxCoord)(r * cos(angleOrig) + 0.5);
-            dstY      = (wxCoord)(r * sin(angleOrig) + 0.5);
-
-            // black pixel?
-            textPixel = data[(srcY*w + srcX)*3] == 0;
-            if ( textPixel || (m_backgroundMode == wxSOLID) )
-            {
-                SetCPixel(XLOG2DEVMAC(x + dstX), YLOG2DEVMAC(y + dstY),
-                          textPixel ? &colText : &colBack);
-            }
-        }
+        m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize);
+        SetAntiAliasedTextEnabled(true, m_scaleY * font->m_macFontSize);
+        m_macAliasWasEnabled = true ;
     }
 
-    // it would be better to draw with non underlined font and draw the line
-    // manually here (it would be more straight...)
-#if 0
-    if ( m_font.GetUnderlined() )
+    OSStatus status = noErr ;
+
+	TECObjectRef ec;
+	status = TECCreateConverter(&ec, kTextEncodingMacRoman, kTextEncodingUnicodeDefault);
+	wxASSERT_MSG( status == noErr , "couldn't start converter" ) ;
+
+    ByteCount byteOutLen ;
+    ByteCount byteInLen = text.Length() ;
+    ByteCount byteBufferLen = byteInLen *2 ;
+    char* buf = new char[byteBufferLen] ;
+
+	status = TECConvertText(ec, (ConstTextPtr)text.c_str() , byteInLen, &byteInLen,
+	    (TextPtr)buf, byteBufferLen, &byteOutLen);
+
+	wxASSERT_MSG( status == noErr , "couldn't convert text" ) ;
+	status = TECDisposeConverter(ec);
+	wxASSERT_MSG( status == noErr , "couldn't dispose converter" ) ;
+
+	ATSUTextLayout atsuLayout ;
+	UniCharCount chars = byteOutLen / 2 ;
+    status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) buf , 0 , byteOutLen / 2 , byteOutLen / 2 , 1 ,
+        &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
+	wxASSERT_MSG( status == noErr , "couldn't create the layout of the rotated text" );
+
+    if ( abs(angle) > 0 )
     {
-        ::MoveTo(XLOG2DEVMAC(x + x4), YLOG2DEVMAC(y + y4 + font->descent));
-        ::LineTo(XLOG2DEVMAC(x + x3), YLOG2DEVMAC(y + y3 + font->descent));
+        Fixed atsuAngle = IntToFixed( angle ) ;
+    	ByteCount angleSize = sizeof(Fixed) ;
+    	ATSUAttributeTag rotationTag = kATSULineRotationTag ;
+    	ATSUAttributeValuePtr	angleValue = &atsuAngle ;
+    	status = ::ATSUSetLayoutControls(atsuLayout , 1 , &rotationTag , &angleSize , &angleValue ) ;
     }
-#endif // 0
 
-    // update the bounding box
-    CalcBoundingBox(x + minX, y + minY);
-    CalcBoundingBox(x + maxX, y + maxY);
+    status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+				IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) );
+	wxASSERT_MSG( status == noErr , "couldn't draw the rotated text" );
+    Rect rect ;
+	status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+					IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) , &rect );
+	wxASSERT_MSG( status == noErr , "couldn't measure the rotated text" );
+
+    OffsetRect( &rect , -m_macLocalOrigin.x , -m_macLocalOrigin.y ) ;
+    CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) );
+    CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) );
+    ::ATSUDisposeTextLayout(atsuLayout);
+    delete[] buf ;
 }
+
 void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText  Invalid DC"));
@@ -1385,71 +1498,115 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
 
 	long xx = XLOG2DEVMAC(x);
 	long yy = YLOG2DEVMAC(y);
-  
-//	if (m_pen.GetStyle() != wxTRANSPARENT)
+#if TARGET_CARBON
+	bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
+	useDrawThemeText = false ;
+#endif
+	MacInstallFont() ;
+    if ( 0 )
+    {
+        m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize);
+        SetAntiAliasedTextEnabled(true, 8);
+        m_macAliasWasEnabled = true ;
+    }
+
+	FontInfo fi ;
+	::GetFontInfo( &fi ) ;
+
+#if TARGET_CARBON
+	if ( !useDrawThemeText )
+#endif
+	    yy += fi.ascent ;
+
+	::MoveTo( xx , yy );
+	if (  m_backgroundMode == wxTRANSPARENT )
 	{
-		MacInstallFont() ;
-		/*
-		Rect clip = { -32000 , -32000 , 32000 , 32000 } ;
-			
-		  ::ClipRect( &clip ) ;
-		*/
-		
-		FontInfo fi ;
-		::GetFontInfo( &fi ) ;
-		
-		yy += fi.ascent ;
-		::MoveTo( xx , yy );
-		if (  m_backgroundMode == wxTRANSPARENT )
-		{
-			::TextMode( srcOr) ;
-		}
-		else
-		{
-			::TextMode( srcCopy ) ;
-		}
+		::TextMode( srcOr) ;
+	}
+	else
+	{
+		::TextMode( srcCopy ) ;
+	}
 
-		const char *text = NULL ;
-		int length = 0 ;
-		wxString macText ;
+	const char *text = NULL ;
+	int length = 0 ;
+	wxString macText ;
 
-		if ( wxApp::s_macDefaultEncodingIsPC )
-		{
-			macText = wxMacMakeMacStringFromPC( strtext ) ;
-			text = macText ;
-			length = macText.Length() ;
-		}
-		else
-		{
-			text = strtext ;
-			length = strtext.Length() ;
-		}
-		
-		int laststop = 0 ;
-		int i = 0 ;
-		int line = 0 ;
-		
-		while( i < length )
-		{
-			if( text[i] == 13 || text[i] == 10)
-			{
-				::DrawText( text , laststop , i - laststop ) ;
-				line++ ;
-				::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) );
-				laststop = i+1 ;
-			}
-			i++ ;
-		}
-				
-		::DrawText( text , laststop , i - laststop ) ;
-		::TextMode( srcOr ) ;
+	if ( wxApp::s_macDefaultEncodingIsPC )
+	{
+		macText = wxMacMakeMacStringFromPC( strtext ) ;
+		text = macText ;
+		length = macText.Length() ;
+	}
+	else
+	{
+		text = strtext ;
+		length = strtext.Length() ;
+	}
+
+	int laststop = 0 ;
+	int i = 0 ;
+	int line = 0 ;
+
+    {
+
+    	while( i < length )
+    	{
+    		if( text[i] == 13 || text[i] == 10)
+    		{
+#if TARGET_CARBON
+            	if ( useDrawThemeText )
+            	{
+    	            Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading)  ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 1000 } ;
+                    CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+            		::DrawThemeTextBox( mString,
+            							kThemeCurrentPortFont,
+            							kThemeStateActive,
+            							false,
+            							&frame,
+            							teJustLeft,
+            							nil );
+            	    CFRelease( mString ) ;
+            	    line++ ;
+                }
+    		    else
+#endif
+    		    {
+        			::DrawText( text , laststop , i - laststop ) ;
+            	    line++ ;
+        			::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) );
+    			}
+        		laststop = i+1 ;
+    		}
+    		i++ ;
+    	}
+#if TARGET_CARBON
+        if ( useDrawThemeText )
+    	{
+    	    Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading)  ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 1000 } ;
+            CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
+    		::DrawThemeTextBox( mString,
+    							kThemeCurrentPortFont,
+    							kThemeStateActive,
+    							false,
+    							&frame,
+    							teJustLeft,
+    							nil );
+            CFRelease( mString ) ;
+        }
+        else
+#endif
+        {
+    	    ::DrawText( text , laststop , i - laststop ) ;
+        }
 	}
+	::TextMode( srcOr ) ;
 }
 
-bool  wxDC::CanGetTextExtent() const 
+bool  wxDC::CanGetTextExtent() const
 {
 	wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));
-		
+
 	return true ;
 }
 
@@ -1460,26 +1617,22 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
    wxCHECK_RET(Ok(), wxT("Invalid DC"));
    wxMacPortSetter helper(this) ;
 
- 	wxFont formerFont = m_font ; 
- 	
+ 	wxFont formerFont = m_font ;
+
 	if ( theFont )
 	{
-		wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
-	
-		if ( font )
-		{
-			::TextFont( font->m_macFontNum ) ;
-			::TextSize( YLOG2DEVREL( font->m_macFontSize) ) ;
-			::TextFace( font->m_macFontStyle ) ;
-		}
-	}
-	else
-	{
-		MacInstallFont() ;
+	    // work around the constness
+       *((wxFont*)(&m_font)) = *theFont ;
 	}
 
+	MacInstallFont() ;
+
 	FontInfo fi ;
 	::GetFontInfo( &fi ) ;
+#if TARGET_CARBON	
+	bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
+	useGetThemeText = false ;
+#endif
 
 	if ( height )
 		*height = YDEV2LOGREL( fi.descent + fi.ascent ) ;
@@ -1487,7 +1640,7 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
 		*descent =YDEV2LOGREL( fi.descent );
 	if ( externalLeading )
 		*externalLeading = YDEV2LOGREL( fi.leading ) ;
-	
+
 	const char *text = NULL ;
 	int length = 0 ;
 	wxString macText ;
@@ -1502,21 +1655,40 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
 		text = string ;
 		length = string.Length() ;
 	}
-	
+
 	int laststop = 0 ;
 	int i = 0 ;
 	int curwidth = 0 ;
 	if ( width )
 	{
 		*width = 0 ;
-	
+
 		while( i < length )
 		{
 			if( text[i] == 13 || text[i] == 10)
 			{
 				if ( height )
 					*height += YDEV2LOGREL( fi.descent + fi.ascent + fi.leading ) ;
-				curwidth = ::TextWidth( text , laststop , i - laststop ) ;
+#if TARGET_CARBON
+                if ( useGetThemeText )
+                {
+                    Point bounds={0,0} ;
+                    SInt16 baseline ;
+                    CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+            		::GetThemeTextDimensions( mString,
+            							kThemeCurrentPortFont,
+            							kThemeStateActive,
+            							false,
+            							&bounds,
+            							&baseline );
+            	    CFRelease( mString ) ;
+            	    curwidth = bounds.h ;
+                }
+                else
+#endif
+                {
+				    curwidth = ::TextWidth( text , laststop , i - laststop ) ;
+				}
 				if ( curwidth > *width )
 					*width = XDEV2LOGREL( curwidth ) ;
 				laststop = i+1 ;
@@ -1524,13 +1696,34 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
 			i++ ;
 		}
 				
-		curwidth = ::TextWidth( text , laststop , i - laststop ) ;
+#if TARGET_CARBON
+        if ( useGetThemeText )
+        {
+            Point bounds={0,0} ;
+            SInt16 baseline ;
+            CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+    		::GetThemeTextDimensions( mString,
+    							kThemeCurrentPortFont,
+    							kThemeStateActive,
+    							false,
+    							&bounds,
+    							&baseline );
+    	    CFRelease( mString ) ;
+    	    curwidth = bounds.h ;
+        }
+        else
+#endif
+        {
+		    curwidth = ::TextWidth( text , laststop , i - laststop ) ;
+		}
 		if ( curwidth > *width )
 			*width = XDEV2LOGREL( curwidth ) ;
 	}
 
 	if ( theFont )
 	{
+	    // work around the constness
+       *((wxFont*)(&m_font)) = formerFont ;
 		m_macFontInstalled = false ;
 	}
 }
@@ -1538,7 +1731,7 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
 wxCoord   wxDC::GetCharWidth(void) const
 {
     wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
- 
+
    wxMacPortSetter helper(this) ;
 
 	MacInstallFont() ;
@@ -1551,7 +1744,7 @@ wxCoord   wxDC::GetCharWidth(void) const
 wxCoord   wxDC::GetCharHeight(void) const
 {
     wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
- 
+
     wxMacPortSetter helper(this) ;
 
 	MacInstallFont() ;
@@ -1564,14 +1757,15 @@ wxCoord   wxDC::GetCharHeight(void) const
 
 void  wxDC::Clear(void)
 {
-    wxCHECK_RET(Ok(), wxT("Invalid DC"));  
+    wxCHECK_RET(Ok(), wxT("Invalid DC"));
     wxMacPortSetter helper(this) ;
-	Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
-	
-	if (m_backgroundBrush.GetStyle() != wxTRANSPARENT) 
+	Rect rect = { -31000 , -31000 , 31000 , 31000 } ;
+
+	if (m_backgroundBrush.GetStyle() != wxTRANSPARENT)
 	{
+	    ::PenNormal() ;
+	    //MacInstallBrush() ;
         MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ;
-	
 		::EraseRect( &rect ) ;
 	}
 }
@@ -1582,7 +1776,9 @@ void wxDC::MacInstallFont() const
 //	if ( m_macFontInstalled )
 //		return ;
 	Pattern blackColor ;
-	
+
+	MacSetupBackgroundForCurrentPort(m_backgroundBrush) ;
+
 	wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
 
 	if ( font )
@@ -1590,7 +1786,7 @@ void wxDC::MacInstallFont() const
 		::TextFont( font->m_macFontNum ) ;
 		::TextSize( short(m_scaleY * font->m_macFontSize) ) ;
 		::TextFace( font->m_macFontStyle ) ;
-	
+
 		m_macFontInstalled = true ;
 		m_macBrushInstalled = false ;
 		m_macPenInstalled = false ;
@@ -1602,15 +1798,19 @@ void wxDC::MacInstallFont() const
 	}
 	else
 	{
-		short fontnum ;
-		
-		GetFNum( "\pGeneva" , &fontnum ) ;
-		::TextFont( fontnum ) ;
-		::TextSize( short(m_scaleY * 10) ) ;
-		::TextFace( 0 ) ;
-	
+        FontFamilyID fontId ;
+    	Str255 fontName ;
+    	SInt16 fontSize ;
+    	Style fontStyle ;
+    	GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+        GetFNum( fontName, &fontId );
+
+		::TextFont( fontId ) ;
+		::TextSize( short(m_scaleY * fontSize) ) ;
+		::TextFace( fontStyle ) ;
+
 		// todo reset after spacing changes - or store the current spacing somewhere
-	
+
 		m_macFontInstalled = true ;
 		m_macBrushInstalled = false ;
 		m_macPenInstalled = false ;
@@ -1624,7 +1824,7 @@ void wxDC::MacInstallFont() const
 	short mode = patCopy ;
 
 	// todo :
-	
+
 	switch( m_logicalFunction )
 	{
 		case wxCOPY:       // src
@@ -1662,17 +1862,95 @@ void wxDC::MacInstallFont() const
 			break ;
 	}
 	::PenMode( mode ) ;
+
+    OSStatus status = noErr ;
+
+    Fixed atsuSize = IntToFixed(m_scaleY * font->m_macFontSize) ;
+
+    Style qdStyle = font->m_macFontStyle ;
+	ATSUFontID	atsuFont = font->m_macATSUFontID ;
+
+    status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ;
+	wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ;
+
+	ATSUAttributeTag atsuTags[] =
+	{
+	    kATSUFontTag ,
+	    kATSUSizeTag ,
+//	    kATSUColorTag ,
+	    kATSUBaselineClassTag ,
+	    kATSUVerticalCharacterTag,
+
+	    kATSUQDBoldfaceTag ,
+	    kATSUQDItalicTag ,
+	    kATSUQDUnderlineTag ,
+	    kATSUQDCondensedTag ,
+	    kATSUQDExtendedTag ,
+
+	} ;
+
+    ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+    {
+        sizeof( ATSUFontID ) ,
+        sizeof( Fixed ) ,
+//        sizeof( RGBColor ) ,
+        sizeof( BslnBaselineClass ) ,
+        sizeof( ATSUVerticalCharacterType),
+
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+
+    } ;
+
+    Boolean kTrue = true ;
+    Boolean kFalse = false ;
+    BslnBaselineClass kBaselineDefault = kBSLNHangingBaseline ;
+
+    ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal;
+
+	ATSUAttributeValuePtr	atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+	{
+	    &atsuFont ,
+	    &atsuSize ,
+//	    &MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) ,
+	    &kBaselineDefault ,
+	    &kHorizontal,
+
+	    (qdStyle & bold) ? &kTrue : &kFalse ,
+	    (qdStyle & italic) ? &kTrue : &kFalse ,
+	    (qdStyle & underline) ? &kTrue : &kFalse ,
+	    (qdStyle & condense) ? &kTrue : &kFalse ,
+	    (qdStyle & extend) ? &kTrue : &kFalse ,
+	} ;
+
+	status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag),
+	    atsuTags, atsuSizes, atsuValues);
+	wxASSERT_MSG( status == noErr , "couldn't set create ATSU style" ) ;
+
 }
 
+Pattern gHatchPatterns[] =
+{
+    { 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF } ,
+    { 0x01 , 0x02 , 0x04 , 0x08 , 0x10 , 0x20 , 0x40 , 0x80 } ,
+    { 0x80 , 0x40 , 0x20 , 0x10 , 0x08 , 0x04 , 0x02 , 0x01 } ,
+    { 0x10 , 0x10 , 0x10 , 0xFF , 0x10 , 0x10 , 0x10 , 0x10 } ,
+    { 0x00 , 0x00 , 0x00 , 0xFF , 0x00 , 0x00 , 0x00 , 0x00 } ,
+    { 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 } ,
+    { 0x81 , 0x42 , 0x24 , 0x18 , 0x18 , 0x24 , 0x42 , 0x81 } ,
+} ;
+
 static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 {
-    // we have our own pattern list now
-	int thePatListID = 128;
-	int theIndex;
+	int theIndex = 1 ;
+
 	switch(hatchStyle)
 	{
 		case wxBDIAGONAL_HATCH:
-			theIndex = 2; 
+			theIndex = 2;
 			break;
 		case wxFDIAGONAL_HATCH:
 			theIndex = 3;
@@ -1687,13 +1965,13 @@ static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 			theIndex = 6;
 			break;
 		case wxCROSSDIAG_HATCH:
-			theIndex = 7; 
+			theIndex = 7;
 			break;
 		default:
 			theIndex = 1; // solid pattern
 			break;
 	}
-	GetIndPattern( pattern, thePatListID, theIndex);	
+	*pattern = gHatchPatterns[theIndex-1] ;
 }
 
 void wxDC::MacInstallPen() const
@@ -1709,17 +1987,17 @@ void wxDC::MacInstallPen() const
 	RGBColor backcolor = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel());
 	::RGBForeColor( &forecolor );
 	::RGBBackColor( &backcolor );
-	
+
 	::PenNormal() ;
 	int penWidth = m_pen.GetWidth() * (int) m_scaleX ;
 
 	// null means only one pixel, at whatever resolution
 	if ( penWidth == 0 )
-		penWidth = 1 ; 
+		penWidth = 1 ;
 	::PenSize(penWidth, penWidth);
 
 	int penStyle = m_pen.GetStyle();
-	
+
 	if (penStyle == wxSOLID)
 	{
 		::PenPat(GetQDGlobalsBlack(&blackColor));
@@ -1775,9 +2053,9 @@ void wxDC::MacInstallPen() const
 	}
 
 	short mode = patCopy ;
-	
+
 	// todo :
-	
+
 	switch( m_logicalFunction )
 	{
 		case wxCOPY:       // only foreground color, leave background (thus not patCopy)
@@ -1820,7 +2098,7 @@ void wxDC::MacInstallPen() const
 	m_macFontInstalled = false ;
 }
 
-void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) 
+void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background )
 {
     Pattern whiteColor ;
     switch( background.MacGetBrushKind() )
@@ -1839,7 +2117,7 @@ void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background )
         }
       case kwxMacBrushColour :
         {
-       	  ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) );
+       	    ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) );
         	int brushStyle = background.GetStyle();
         	if (brushStyle == wxSOLID)
         		::BackPat(GetQDGlobalsWhite(&whiteColor));
@@ -1867,14 +2145,17 @@ void wxDC::MacInstallBrush() const
 //		return ;
 
 	// foreground
-	
+
 	bool backgroundTransparent = (GetBackgroundMode() == wxTRANSPARENT) ;
 
 	::RGBForeColor( &MAC_WXCOLORREF( m_brush.GetColour().GetPixel()) );
+	::RGBBackColor( &MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()) );
 
 	int brushStyle = m_brush.GetStyle();
 	if (brushStyle == wxSOLID)
+	{
 		::PenPat(GetQDGlobalsBlack(&blackColor));
+    }
 	else if (IS_HATCH(brushStyle))
 	{
 		Pattern pat ;
@@ -1893,9 +2174,9 @@ void wxDC::MacInstallBrush() const
 
 	    if ( m_brush.GetStyle() == wxSTIPPLE )
 	        gw = MAC_WXHBITMAP(bitmap->GetHBITMAP())  ;
-	    else 
+	    else
 	        gw = MAC_WXHBITMAP(bitmap->GetMask()->GetMaskBitmap()) ;
-	        
+
         PixMapHandle gwpixmaphandle = GetGWorldPixMap( gw ) ;
         LockPixels( gwpixmaphandle ) ;
 
@@ -1907,41 +2188,38 @@ void wxDC::MacInstallBrush() const
                 isMonochrome = true ;
         }
 
-
-	    if ( isMonochrome )
+        if ( isMonochrome && width == 8 && height == 8 )
 	    {
 	        ::RGBForeColor( &MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) );
-
+	        ::RGBForeColor( &MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) );
             BitMap* gwbitmap = (BitMap*) *gwpixmaphandle ; // since the color depth is 1 it is a BitMap
             UInt8 *gwbits = (UInt8*) gwbitmap->baseAddr ;
             int alignment = gwbitmap->rowBytes & 0x7FFF ;
-
-    	    if( width == 8 && height == 8 )
-    	    {
-                Pattern pat ;
-                for ( int i = 0 ; i < 8 ; ++i )
-                {
-                    pat.pat[i] = gwbits[i*alignment+0] ;
-                }
-                UnlockPixels( GetGWorldPixMap( gw ) ) ;
-                ::PenPat( &pat ) ;
-    	    }
-    	    else
-    	    {
- #if wxMAC_EXPERIMENTAL_PATTERN
+            Pattern pat ;
+            for ( int i = 0 ; i < 8 ; ++i )
+            {
+                pat.pat[i] = gwbits[i*alignment+0] ;
+            }
+            UnlockPixels( GetGWorldPixMap( gw ) ) ;
+            ::PenPat( &pat ) ;
+	    }
+	    else
+	    {
  // this will be the code to handle power of 2 patterns, we will have to arrive at a nice
  // caching scheme before putting this into production
-            	Handle      image;
-            	long		imageSize;
-    	        PixPatHandle pixpat = NewPixPat() ;
-
-		        CopyPixMap(gwpixmaphandle, (**pixpat).patMap);
-	            imageSize = GetPixRowBytes((**pixpat).patMap) *
-				    ((**(**pixpat).patMap).bounds.bottom -
-				    (**(**pixpat).patMap).bounds.top);
-				
-	            PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize );
-	            (**pixpat).patData = image;
+        	Handle      image;
+        	long		imageSize;
+	        PixPatHandle pixpat = NewPixPat() ;
+
+	        CopyPixMap(gwpixmaphandle, (**pixpat).patMap);
+            imageSize = GetPixRowBytes((**pixpat).patMap) *
+			    ((**(**pixpat).patMap).bounds.bottom -
+			    (**(**pixpat).patMap).bounds.top);
+
+            PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize );
+            (**pixpat).patData = image;
+            if ( isMonochrome )
+            {
 	            CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ;
 	            ColorSpecPtr ctspec = (ColorSpecPtr) &(**ctable).ctTable ;
 	            if ( ctspec[0].rgb.red == 0x0000 )
@@ -1955,12 +2233,9 @@ void wxDC::MacInstallBrush() const
 	                ctspec[1].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ;
 	            }
 	            ::CTabChanged( ctable ) ;
-	            ::PenPixPat(pixpat);
-#endif
-    	    }
-	    }
-	    else
-	    {
+            }
+            ::PenPixPat(pixpat);
+            m_macForegroundPixMap = pixpat ;
 	    }
 	    UnlockPixels( gwpixmaphandle ) ;
 	}
@@ -1968,10 +2243,7 @@ void wxDC::MacInstallBrush() const
     {
 	    ::PenPat(GetQDGlobalsBlack(&blackColor));
 	}
-	
-    if ( !backgroundTransparent )
-        ::RGBBackColor( &MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ) ;
-	
+
 	short mode = patCopy ;
 	switch( m_logicalFunction )
 	{