Make wxr resources work in Unicode mode.

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

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 27d92a4efc875e3e7f72f825930969a6af10bc32..b0e3183298e87046fb07854c91fb23baaba6014f 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -8,149 +8,280 @@
 // Copyright:   (c) AUTHOR
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) AUTHOR
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-

 #ifdef __GNUG__
 #pragma implementation "dc.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "dc.h"
 #endif

-

 #include "wx/dc.h"
 #include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/image.h"
 #include "wx/dc.h"
 #include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/image.h"

+#include "wx/log.h"

 
 #if __MSL__ >= 0x6000
 #include "math.h"
 
 #if __MSL__ >= 0x6000
 #include "math.h"

+using namespace std ;

 #endif
 #endif

-
+#include "wx/mac/private.h"
+#include "ATSUnicode.h"
+#include "TextCommon.h"
+#include "TextEncodingConverter.h"

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #endif
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #endif

-

 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------

-

 #define mm2inches              0.0393700787402
 #define inches2mm              25.4
 #define mm2twips               56.6929133859
 #define twips2mm               0.0176388888889
 #define mm2pt                  2.83464566929
 #define pt2mm                  0.352777777778
 #define mm2inches              0.0393700787402
 #define inches2mm              25.4
 #define mm2twips               56.6929133859
 #define twips2mm               0.0176388888889
 #define mm2pt                  2.83464566929
 #define pt2mm                  0.352777777778

-#ifndef __UNIX__
+#ifndef __DARWIN__

 const double M_PI = 3.14159265358979 ;
 #endif
 const double RAD2DEG  = 180.0 / M_PI;
 const double M_PI = 3.14159265358979 ;
 #endif
 const double RAD2DEG  = 180.0 / M_PI;

-
+const short kEmulatedMode = -1 ;
+const short kUnsupportedMode = -2 ;
+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 )
+    {
+#if 0
+       // this clipping area was set to the parent window's drawing area, lead to problems
+       // with MacOSX controls drawing outside their wx' rectangle
+        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->MacGetRightBorderSize(), 
+         size.y - 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 ) ;
+#endif
+        RgnHandle insidergn = NewRgn() ;
+        int x = 0 , y = 0;
+        win->MacWindowToRootWindow( &x,&y ) ;
+        CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion().GetWXHRGN() , m_newClip ) ;
+        OffsetRgn( m_newClip , x , y ) ;
+        SetClip( m_newClip ) ;
+       }
+}
+wxMacWindowClipper::~wxMacWindowClipper() 
+{
+    SetClip( m_formerClip ) ;
+       DisposeRgn( m_newClip ) ;
+       DisposeRgn( m_formerClip ) ;
+}

 //-----------------------------------------------------------------------------
 // Local functions
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Local functions
 //-----------------------------------------------------------------------------

-

 static inline double dmin(double a, double b) { return a < b ? a : b; }
 static inline double dmax(double a, double b) { return a > b ? a : b; }
 static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
 static inline double dmin(double a, double b) { return a < b ? a : b; }
 static inline double dmax(double a, double b) { return a > b ? a : b; }
 static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }

-

 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------

-
+// this function emulates all wx colour manipulations, used to verify the implementation
+// by setting the mode in the blitting functions to kEmulatedMode
+void wxMacCalculateColour( int logical_func , const RGBColor &srcColor , RGBColor &dstColor ) ;
+void wxMacCalculateColour( int logical_func , const RGBColor &srcColor , RGBColor &dstColor )
+{
+    switch ( logical_func )
+    {
+       case wxAND:        // src AND dst
+           dstColor.red = dstColor.red & srcColor.red ;
+           dstColor.green = dstColor.green & srcColor.green ;
+           dstColor.blue = dstColor.blue & srcColor.blue ;
+           break ;
+       case wxAND_INVERT: // (NOT src) AND dst
+           dstColor.red = dstColor.red & ~srcColor.red ;
+           dstColor.green = dstColor.green & ~srcColor.green ;
+           dstColor.blue = dstColor.blue & ~srcColor.blue ;
+           break ;
+       case wxAND_REVERSE:// src AND (NOT dst)
+           dstColor.red = ~dstColor.red & srcColor.red ;
+           dstColor.green = ~dstColor.green & srcColor.green ;
+           dstColor.blue = ~dstColor.blue & srcColor.blue ;
+           break ;
+       case wxCLEAR:      // 0
+           dstColor.red = 0 ;
+           dstColor.green = 0 ;
+           dstColor.blue = 0 ;
+           break ;
+        case wxCOPY:       // src
+           dstColor.red = srcColor.red ;
+           dstColor.green = srcColor.green ;
+           dstColor.blue = srcColor.blue ;
+               break ;
+       case wxEQUIV:      // (NOT src) XOR dst
+           dstColor.red = dstColor.red ^ ~srcColor.red ;
+           dstColor.green = dstColor.green ^ ~srcColor.green ;
+           dstColor.blue = dstColor.blue ^ ~srcColor.blue ;
+           break ;
+       case wxINVERT:     // NOT dst
+           dstColor.red = ~dstColor.red ;
+           dstColor.green = ~dstColor.green ;
+           dstColor.blue = ~dstColor.blue ;
+               break ;
+       case wxNAND:       // (NOT src) OR (NOT dst)
+           dstColor.red = ~dstColor.red | ~srcColor.red ;
+           dstColor.green = ~dstColor.green | ~srcColor.green ;
+           dstColor.blue = ~dstColor.blue | ~srcColor.blue ;
+           break ;
+       case wxNOR:        // (NOT src) AND (NOT dst)
+           dstColor.red = ~dstColor.red & ~srcColor.red ;
+           dstColor.green = ~dstColor.green & ~srcColor.green ;
+           dstColor.blue = ~dstColor.blue & ~srcColor.blue ;
+           break ;
+       case wxNO_OP:      // dst
+           break ;
+       case wxOR:         // src OR dst
+           dstColor.red = dstColor.red | srcColor.red ;
+           dstColor.green = dstColor.green | srcColor.green ;
+           dstColor.blue = dstColor.blue | srcColor.blue ;
+           break ;
+       case wxOR_INVERT:  // (NOT src) OR dst
+           dstColor.red = dstColor.red | ~srcColor.red ;
+           dstColor.green = dstColor.green | ~srcColor.green ;
+           dstColor.blue = dstColor.blue | ~srcColor.blue ;
+           break ;
+       case wxOR_REVERSE: // src OR (NOT dst)
+           dstColor.red = ~dstColor.red | srcColor.red ;
+           dstColor.green = ~dstColor.green | srcColor.green ;
+           dstColor.blue = ~dstColor.blue | srcColor.blue ;
+               break ;
+       case wxSET:        // 1
+           dstColor.red = 0xFFFF ;
+           dstColor.green = 0xFFFF ;
+           dstColor.blue = 0xFFFF ;
+           break ;
+       case wxSRC_INVERT: // (NOT src)
+           dstColor.red = ~srcColor.red ;
+           dstColor.green = ~srcColor.green ;
+           dstColor.blue = ~srcColor.blue ;
+               break ;
+       case wxXOR:        // src XOR dst
+           dstColor.red = dstColor.red ^ srcColor.red ;
+           dstColor.green = dstColor.green ^ srcColor.green ;
+           dstColor.blue = dstColor.blue ^ srcColor.blue ;
+               break ;
+    }
+}

 wxDC::wxDC()
 {
   m_ok = FALSE;
   m_colour = TRUE;
 wxDC::wxDC()
 {
   m_ok = FALSE;
   m_colour = TRUE;

-  

   m_mm_to_pix_x = mm2pt;
   m_mm_to_pix_y = mm2pt;
   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_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_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_needComputeScaleX = FALSE;
   m_needComputeScaleY = FALSE;

-  
-  m_maxX = m_maxY = -100000;
-  m_minY = m_minY =  100000;
-

   m_macPort = NULL ;
   m_macMask = NULL ;
   m_ok = FALSE ;
   m_macPort = NULL ;
   m_macMask = NULL ;
   m_ok = FALSE ;

-  

        m_macFontInstalled = false ;
        m_macBrushInstalled = false ;
        m_macPenInstalled = false ;
        m_macFontInstalled = false ;
        m_macBrushInstalled = false ;
        m_macPenInstalled = false ;

-       
-       m_macLocalOrigin.h = m_macLocalOrigin.v = 0 ;
-       m_macClipRect.left = -32000 ;
-       m_macClipRect.top = -32000 ;
-       m_macClipRect.right = 32000 ;
-       m_macClipRect.bottom = 32000 ;
-
+       m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ;
+       m_macBoundaryClipRgn = NewRgn() ;
+       m_macCurrentClipRgn = NewRgn() ;
+       SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , -32000 , -32000 , 32000 , 32000 ) ;
+       SetRectRgn( (RgnHandle) m_macCurrentClipRgn , -32000 , -32000 , 32000 , 32000 ) ;

     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
     m_brush = *wxWHITE_BRUSH;
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
     m_brush = *wxWHITE_BRUSH;

+    m_macCurrentPortStateHelper = NULL ;
+    m_macATSUIStyle = NULL ;
+    m_macAliasWasEnabled = false;
+    m_macForegroundPixMap = NULL ;
+    m_macBackgroundPixMap = NULL ;

 }
 }

-wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
-       m_ph( dc->m_macPort ) 
-{
-       wxASSERT( dc->Ok() ) ;
-       
-       dc->MacSetupPort(&m_ph) ;
-}
-
-wxMacPortSetter::~wxMacPortSetter() 
-{
-}
-

 wxDC::~wxDC(void)
 {
 wxDC::~wxDC(void)
 {

+    DisposeRgn( (RgnHandle) m_macBoundaryClipRgn ) ;
+    DisposeRgn( (RgnHandle) m_macCurrentClipRgn ) ;

 }
 }

-void wxDC::MacSetupPort(AGAPortHelper* help) const
+void wxDC::MacSetupPort(wxMacPortStateHelper* help) const

 {
 {

-//     help->Setup( m_macPort ) ;
-       ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);
-
-       if ( m_clipping )
-       {
-               Rect clip = { m_clipY1 , m_clipX1 , m_clipY2 , m_clipX2 } ;
-               ::SectRect( &clip , &m_macClipRect , &clip ) ;
-               ::ClipRect( &clip ) ;
-       }
-       else
-       {
-               ::ClipRect(&m_macClipRect);
-       }
-
-
+    wxASSERT( m_macCurrentPortStateHelper == NULL ) ;
+    m_macCurrentPortStateHelper = help ;
+       SetClip( (RgnHandle) m_macCurrentClipRgn);

        m_macFontInstalled = false ;
        m_macBrushInstalled = false ;
        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") );
 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") );
      wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") );

- 

      wxMacPortSetter helper(this) ;
      wxMacPortSetter helper(this) ;

- 
-     wxCoord xx = XLOG2DEV(x);
-     wxCoord yy = YLOG2DEV(y);
+     wxCoord xx = XLOG2DEVMAC(x);
+     wxCoord yy = YLOG2DEVMAC(y);

      wxCoord w = bmp.GetWidth();
      wxCoord h = bmp.GetHeight();
      wxCoord ww = XLOG2DEVREL(w);
      wxCoord hh = YLOG2DEVREL(h);
      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 :
      // Set up drawing mode
      short  mode = (m_logicalFunction == wxCOPY ? srcCopy :
                     //m_logicalFunction == wxCLEAR ? WHITENESS :


@@ -165,22 +296,20 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
                     //m_logicalFunction == wxSRC_OR ? srcOr :
                     //m_logicalFunction == wxSRC_AND ? SRCAND :
                     srcCopy );
                     //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 ) ;
      if ( bmp.GetBitmapType() == kMacBitmapTypePict ) {
          Rect bitmaprect = { 0 , 0 , hh, ww };
          ::OffsetRect( &bitmaprect, xx, yy ) ;

-         ::DrawPicture( bmp.GetPict(), &bitmaprect ) ;
+         ::DrawPicture( (PicHandle) bmp.GetPict(), &bitmaprect ) ;

     }
      else if ( bmp.GetBitmapType() == kMacBitmapTypeGrafWorld )
      {
     }
      else if ( bmp.GetBitmapType() == kMacBitmapTypeGrafWorld )
      {

-         GWorldPtr    bmapworld = bmp.GetHBITMAP();
+         GWorldPtr    bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP() );

          PixMapHandle bmappixels ;
          PixMapHandle bmappixels ;

- 

          // Set foreground and background colours (for bitmaps depth = 1)
          if(bmp.GetDepth() == 1)
         {
          // Set foreground and background colours (for bitmaps depth = 1)
          if(bmp.GetDepth() == 1)
         {

-             RGBColor fore = m_textForegroundColour.GetPixel();
-             RGBColor back = m_textBackgroundColour.GetPixel();
+             RGBColor fore = MAC_WXCOLORREF(m_textForegroundColour.GetPixel());
+             RGBColor back = MAC_WXCOLORREF(m_textBackgroundColour.GetPixel());

              RGBForeColor(&fore);
              RGBBackColor(&back);
          }
              RGBForeColor(&fore);
              RGBBackColor(&back);
          }


@@ -191,32 +320,28 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
              RGBForeColor( &black ) ;
              RGBBackColor( &white ) ;
          }
              RGBForeColor( &black ) ;
              RGBBackColor( &white ) ;
          }

- 

          bmappixels = GetGWorldPixMap( bmapworld ) ;
          bmappixels = GetGWorldPixMap( bmapworld ) ;

- 

          wxCHECK_RET(LockPixels(bmappixels),
                      wxT("DoDrawBitmap:  Unable to lock pixels"));
          wxCHECK_RET(LockPixels(bmappixels),
                      wxT("DoDrawBitmap:  Unable to lock pixels"));

- 

          Rect source = { 0, 0, h, w };
          Rect dest   = { yy, xx, yy + hh, xx + ww };
          Rect source = { 0, 0, h, w };
          Rect dest   = { yy, xx, yy + hh, xx + ww };

- 

          if ( useMask && bmp.GetMask() )
          {
          if ( useMask && bmp.GetMask() )
          {

-             if( LockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap())))
+             if( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap()))))

              {
                  CopyDeepMask
                      (
                       GetPortBitMapForCopyBits(bmapworld),
              {
                  CopyDeepMask
                      (
                       GetPortBitMapForCopyBits(bmapworld),

-                      GetPortBitMapForCopyBits(bmp.GetMask()->GetMaskBitmap()),
-                      GetPortBitMapForCopyBits( m_macPort ),
+                      GetPortBitMapForCopyBits(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())),
+                      GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ),

                       &source, &source, &dest, mode, NULL
                       );
                       &source, &source, &dest, mode, NULL
                       );

-                 UnlockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap()));
+                 UnlockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())));

              }
          }
          else {
              CopyBits( GetPortBitMapForCopyBits( bmapworld ),
              }
          }
          else {
              CopyBits( GetPortBitMapForCopyBits( bmapworld ),

-                       GetPortBitMapForCopyBits( m_macPort ),
+                       GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ),

                        &source, &dest, mode, NULL ) ;
          }
          UnlockPixels( bmappixels ) ;
                        &source, &dest, mode, NULL ) ;
          }
          UnlockPixels( bmappixels ) ;


@@ -225,32 +350,28 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
      {
         Rect bitmaprect = { 0 , 0 , bmp.GetHeight(), bmp.GetWidth() } ;
         OffsetRect( &bitmaprect, xx, yy ) ;
      {
         Rect bitmaprect = { 0 , 0 , bmp.GetHeight(), bmp.GetWidth() } ;
         OffsetRect( &bitmaprect, xx, yy ) ;

-        PlotCIconHandle( &bitmaprect , atNone , ttNone , bmp.GetHICON() ) ;
+        PlotCIconHandle( &bitmaprect , atNone , ttNone , MAC_WXHICON(bmp.GetHICON()) ) ;

      }
      m_macPenInstalled = false ;
      m_macBrushInstalled = false ;
      m_macFontInstalled = false ;
      }
      m_macPenInstalled = false ;
      m_macBrushInstalled = false ;
      m_macFontInstalled = false ;

-

 }
 }

-

 void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 {
      wxCHECK_RET(Ok(), wxT("Invalid dc  wxDC::DoDrawIcon"));
 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"));
      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 )
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion  Invalid DC"));
     wxCoord xx, yy, ww, hh;
     DoDrawBitmap( icon , x , y , icon.GetMask() != NULL ) ;
 }
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion  Invalid DC"));
     wxCoord xx, yy, ww, hh;

-
-    xx = XLOG2DEV(x);
-    yy = YLOG2DEV(y);
+    xx = XLOG2DEVMAC(x);
+    yy = YLOG2DEVMAC(y);

     ww = XLOG2DEVREL(width);
     hh = YLOG2DEVREL(height);
     ww = XLOG2DEVREL(width);
     hh = YLOG2DEVREL(height);

-
+    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 );
     if( m_clipping )
     {
         m_clipX1 = wxMax( m_clipX1 , xx );


@@ -266,29 +387,60 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
         m_clipX2 = xx + ww;
         m_clipY2 = yy + hh;
     }
         m_clipX2 = xx + ww;
         m_clipY2 = yy + hh;
     }

-

 }
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;
 }
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;

-

        wxMacPortSetter helper(this) ;
     if (region.Empty())
     {
         DestroyClippingRegion();
         return;
     }
        wxMacPortSetter helper(this) ;
     if (region.Empty())
     {
         DestroyClippingRegion();
         return;
     }

-
+    wxCoord x, y, w, h;
+    region.GetBox( x, y, w, h );

     wxCoord xx, yy, ww, hh;
     wxCoord xx, yy, ww, hh;

-    region.GetBox( xx, yy, ww, hh );
-    wxDC::DoSetClippingRegion( xx, yy, ww, hh );
+    xx = XLOG2DEVMAC(x);
+    yy = YLOG2DEVMAC(y);
+    ww = XLOG2DEVREL(w);
+    hh = YLOG2DEVREL(h);
+    // if we have a scaling that we cannot map onto native regions
+    // we must use the box
+    if ( ww != w || hh != h )
+    {
+        wxDC::DoSetClippingRegion( x, y, w, h );
+    }
+    else
+    {
+        CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn ) ;
+        if ( xx != x || yy != y )
+        {
+            OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y ) ;
+        }
+        SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
+        if( m_clipping )
+        {
+            m_clipX1 = wxMax( m_clipX1 , xx );
+            m_clipY1 = wxMax( m_clipY1 , yy );
+            m_clipX2 = wxMin( m_clipX2, (xx + ww));
+            m_clipY2 = wxMin( m_clipY2, (yy + hh));
+        }
+        else
+        {
+            m_clipping = TRUE;
+            m_clipX1 = xx;
+            m_clipY1 = yy;
+            m_clipX2 = xx + ww;
+            m_clipY2 = yy + hh;
+        }
+    }

 }
 }

-

 void wxDC::DestroyClippingRegion()
 {
   wxMacPortSetter helper(this) ;
 void wxDC::DestroyClippingRegion()
 {
   wxMacPortSetter helper(this) ;

+  CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;

   m_clipping = FALSE;
   m_clipping = FALSE;

-}    
+}

 void wxDC::DoGetSize( int* width, int* height ) const
 {
   *width = m_maxX-m_minX;
 void wxDC::DoGetSize( int* width, int* height ) const
 {
   *width = m_maxX-m_minX;


@@ -316,7 +468,7 @@ void wxDC::SetTextBackground( const wxColour &col )
 }
 void wxDC::SetMapMode( int mode )
 {
 }
 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 );
   {
     case wxMM_TWIPS:
       SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );


@@ -367,7 +519,6 @@ void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
   m_externalDeviceOriginY = y;
   ComputeScaleAndOrigin();
 }
   m_externalDeviceOriginY = y;
   ComputeScaleAndOrigin();
 }

-

 #if 0
 void wxDC::SetInternalDeviceOrigin( long x, long y )
 {
 #if 0
 void wxDC::SetInternalDeviceOrigin( long x, long y )
 {


@@ -386,38 +537,29 @@ void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
   m_signX = (xLeftRight ?  1 : -1);
   m_signY = (yBottomUp  ? -1 :  1);
   ComputeScaleAndOrigin();
   m_signX = (xLeftRight ?  1 : -1);
   m_signY = (yBottomUp  ? -1 :  1);
   ComputeScaleAndOrigin();

-}/*
-    
-void wxDC::CalcBoundingBox( long x, long y )
-{
-  if (x < m_minX) m_minX = x;
-  if (y < m_minY) m_minY = y;
-  if (x > m_maxX) m_maxX = x;
-  if (y > m_maxY) m_maxY = y;
-}*/
+}

 wxSize wxDC::GetPPI() const
 {
     return wxSize(72, 72);
 }
 wxSize wxDC::GetPPI() const
 {
     return wxSize(72, 72);
 }

-

 int wxDC::GetDepth() const
 {
 int wxDC::GetDepth() const
 {

-       return wxDisplayDepth() ;
+    if ( IsPortColor( (CGrafPtr) m_macPort ) )
+    {
+        return ( (**GetPortPixMap( (CGrafPtr) m_macPort)).pixelSize ) ;
+    }
+    return 1 ;

 }
 }

-

 void wxDC::ComputeScaleAndOrigin()
 {
   // CMB: copy scale to see if it changes
   double origScaleX = m_scaleX;
   double origScaleY = m_scaleY;
 void wxDC::ComputeScaleAndOrigin()
 {
   // CMB: copy scale to see if it changes
   double origScaleX = m_scaleX;
   double origScaleY = m_scaleY;

-

   m_scaleX = m_logicalScaleX * m_userScaleX;
   m_scaleY = m_logicalScaleY * m_userScaleY;
   m_scaleX = m_logicalScaleX * m_userScaleX;
   m_scaleY = m_logicalScaleY * m_userScaleY;

-

   m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX;
   m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY;
   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
   if (m_scaleX != origScaleX || m_scaleY != origScaleY)
   {
     // this is a bit artificial, but we need to force wxDC to think


@@ -431,107 +573,79 @@ void wxDC::ComputeScaleAndOrigin()
 void  wxDC::SetPalette( const wxPalette& palette )
 {
 }
 void  wxDC::SetPalette( const wxPalette& palette )
 {
 }

-

 void  wxDC::SetBackgroundMode( int mode )
 {
        m_backgroundMode = mode ;
 }
 void  wxDC::SetBackgroundMode( int mode )
 {
        m_backgroundMode = mode ;
 }

-

 void  wxDC::SetFont( const wxFont &font )
 {
 void  wxDC::SetFont( const wxFont &font )
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
-

     m_font = font;
     m_macFontInstalled = false ;
 }
     m_font = font;
     m_macFontInstalled = false ;
 }

-

 void  wxDC::SetPen( const wxPen &pen )
 {
 void  wxDC::SetPen( const wxPen &pen )
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
-

        if ( m_pen == pen )
                return ;
        if ( m_pen == pen )
                return ;

-               

   m_pen = pen;
   m_pen = pen;

-

   m_macPenInstalled = false ;
 }
   m_macPenInstalled = false ;
 }

-

 void  wxDC::SetBrush( const wxBrush &brush )
 {
 void  wxDC::SetBrush( const wxBrush &brush )
 {

-  wxCHECK_RET(Ok(), wxT("Invalid DC"));
-  
-  if (m_brush == brush) 
+  if (m_brush == brush)

        return;
        return;

-  

   m_brush = brush;
   m_macBrushInstalled = false ;
 }
   m_brush = brush;
   m_macBrushInstalled = false ;
 }

-

 void  wxDC::SetBackground( const wxBrush &brush )
 {
 void  wxDC::SetBackground( const wxBrush &brush )
 {

-  wxCHECK_RET(Ok(), wxT("Invalid DC"));
-  
-  if (m_backgroundBrush == brush) 
+  if (m_backgroundBrush == brush)

        return;
        return;

-  

   m_backgroundBrush = brush;
   m_backgroundBrush = brush;

-  
-  if (!m_backgroundBrush.Ok()) 
+  if (!m_backgroundBrush.Ok())

        return;
    m_macBrushInstalled = false ;
 }
        return;
    m_macBrushInstalled = false ;
 }

-

 void  wxDC::SetLogicalFunction( int function )
 {
 void  wxDC::SetLogicalFunction( int function )
 {

-       if (m_logicalFunction == function) 
+       if (m_logicalFunction == function)

                return;
                return;

-

        m_logicalFunction = function ;
        m_macFontInstalled = false ;
        m_macBrushInstalled = false ;
        m_macPenInstalled = false ;
 }
        m_logicalFunction = function ;
        m_macFontInstalled = false ;
        m_macBrushInstalled = false ;
        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) ;
 {
     wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel  Invalid DC") );
     wxMacPortSetter helper(this) ;

-

     RGBColor colour;
     RGBColor colour;

-
-    GetCPixel( XLOG2DEV(x), YLOG2DEV(y), &colour );
-
+    GetCPixel( XLOG2DEVMAC(x), YLOG2DEVMAC(y), &colour );

     // Convert from Mac colour to wx
     col->Set( colour.red   >> 8,
               colour.green >> 8,
               colour.blue  >> 8);
     // Convert from Mac colour to wx
     col->Set( colour.red   >> 8,
               colour.green >> 8,
               colour.blue  >> 8);

-

     return true ;
 }
     return true ;
 }

-

 void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
 void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));

-       

   wxMacPortSetter helper(this) ;
   wxMacPortSetter helper(this) ;

-  

   if (m_pen.GetStyle() != wxTRANSPARENT)
   {
                MacInstallPen() ;
                wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
                             m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2;
   if (m_pen.GetStyle() != wxTRANSPARENT)
   {
                MacInstallPen() ;
                wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
                             m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2;

-
-        wxCoord xx1 = XLOG2DEV(x1) - offset;
-        wxCoord yy1 = YLOG2DEV(y1) - offset;
-        wxCoord xx2 = XLOG2DEV(x2) - offset;
-        wxCoord yy2 = YLOG2DEV(y2) - offset;
-
+        wxCoord xx1 = XLOG2DEVMAC(x1) - offset;
+        wxCoord yy1 = YLOG2DEVMAC(y1) - offset;
+        wxCoord xx2 = XLOG2DEVMAC(x2) - offset;
+        wxCoord yy2 = YLOG2DEVMAC(y2) - offset;

         if ((m_pen.GetCap() == wxCAP_ROUND) &&
             (m_pen.GetWidth() <= 1))
        {
         if ((m_pen.GetCap() == wxCAP_ROUND) &&
             (m_pen.GetWidth() <= 1))
        {


@@ -552,32 +666,30 @@ void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
                        xx2++;
                }
        }
                        xx2++;
                }
        }

-       

                ::MoveTo(xx1, yy1);
                ::LineTo(xx2, yy2);
   }
 }
                ::MoveTo(xx1, yy1);
                ::LineTo(xx2, yy2);
   }
 }

-

 void  wxDC::DoCrossHair( wxCoord x, wxCoord y )
 {
     wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair  Invalid window dc") );
 void  wxDC::DoCrossHair( wxCoord x, wxCoord y )
 {
     wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair  Invalid window dc") );

-
+    wxMacPortSetter helper(this) ;

     if (m_pen.GetStyle() != wxTRANSPARENT)
     {
         int w = 0;
         int h = 0;
         GetSize( &w, &h );
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {
         int w = 0;
         int h = 0;
         GetSize( &w, &h );

-        wxCoord xx = XLOG2DEV(x);
-        wxCoord yy = YLOG2DEV(y);
-
+        wxCoord xx = XLOG2DEVMAC(x);
+        wxCoord yy = YLOG2DEVMAC(y);

         MacInstallPen();
         MacInstallPen();

-        ::MoveTo( 0, yy );
-        ::LineTo( XLOG2DEVREL(w), yy );
-        ::MoveTo( xx, 0 );
-        ::LineTo( xx, YLOG2DEVREL(h) );
+        ::MoveTo( XLOG2DEVMAC(0), yy );
+        ::LineTo( XLOG2DEVMAC(w), yy );
+        ::MoveTo( xx, YLOG2DEVMAC(0) );
+        ::LineTo( xx, YLOG2DEVMAC(h) );
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x+w, y+h);

     }
 }
     }
 }

-

 /*
  * To draw arcs properly the angles need to be converted from the WX style:
  * Angles start on the +ve X axis and go anti-clockwise (As you would draw on
 /*
  * To draw arcs properly the angles need to be converted from the WX style:
  * Angles start on the +ve X axis and go anti-clockwise (As you would draw on


@@ -585,52 +697,31 @@ void  wxDC::DoCrossHair( wxCoord x, wxCoord y )
  * TO
  * the Mac style:
  * Angles start on the +ve y axis and go clockwise.
  * TO
  * the Mac style:
  * Angles start on the +ve y axis and go clockwise.

- * To achive this I work out which quadrant the angle lies in then map this to
- * the equivalent quadrant on the Mac.  (Sin and Cos values reveal which
- * quadrant you are in).

  */
 static double wxConvertWXangleToMACangle(double angle)
 {
  */
 static double wxConvertWXangleToMACangle(double angle)
 {

-    double sin_a, cos_a;
-
-    sin_a = sin(angle / RAD2DEG);
-    cos_a = cos(angle / RAD2DEG);
-
-    if( (sin_a >= 0.0) && (cos_a >= 0.0) ) {
-        angle = acos(sin_a) * RAD2DEG;
-    }
-    else if( (sin_a >= 0.0) && (cos_a <= 0.0) ) {
-        sin_a *= -1;
-        angle = acos(sin_a) * RAD2DEG + 180;
-    }
-    else if( (sin_a <= 0.0) && (cos_a >=  0.0) ) {
-        angle = acos(sin_a) * RAD2DEG + 180;
-    }
-    else if( (sin_a <  0.0) && (cos_a <  0.0) ) {
-        sin_a *= -1;
-        angle = acos(sin_a) * RAD2DEG + 180;
-    }
-    return angle;
+    double newAngle = 90 - angle ;
+    if ( newAngle < 0 )
+        newAngle += 360 ;
+    return newAngle ;

 }
 }

-

 void  wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
                            wxCoord x2, wxCoord y2,
                            wxCoord xc, wxCoord yc )
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc  Invalid DC"));
 void  wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
                            wxCoord x2, wxCoord y2,
                            wxCoord xc, wxCoord yc )
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc  Invalid DC"));

-
-    wxCoord xx1 = XLOG2DEV(x1);
-    wxCoord yy1 = YLOG2DEV(y1);
-    wxCoord xx2 = XLOG2DEV(x2);
-    wxCoord yy2 = YLOG2DEV(y2);
-    wxCoord xxc = XLOG2DEV(xc);
-    wxCoord yyc = YLOG2DEV(yc);
+    wxMacPortSetter helper(this) ;
+    wxCoord xx1 = XLOG2DEVMAC(x1);
+    wxCoord yy1 = YLOG2DEVMAC(y1);
+    wxCoord xx2 = XLOG2DEVMAC(x2);
+    wxCoord yy2 = YLOG2DEVMAC(y2);
+    wxCoord xxc = XLOG2DEVMAC(xc);
+    wxCoord yyc = YLOG2DEVMAC(yc);

     double dx = xx1 - xxc;
     double dy = yy1 - yyc;
     double radius = sqrt((double)(dx*dx+dy*dy));
     wxCoord rad   = (wxCoord)radius;
     double radius1, radius2;
     double dx = xx1 - xxc;
     double dy = yy1 - yyc;
     double radius = sqrt((double)(dx*dx+dy*dy));
     wxCoord rad   = (wxCoord)radius;
     double radius1, radius2;

-

     if (xx1 == xx2 && yy1 == yy2)
     {
         radius1 = 0.0;
     if (xx1 == xx2 && yy1 == yy2)
     {
         radius1 = 0.0;


@@ -654,9 +745,7 @@ void  wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
      if( (xx1 > xx2) || (yy1 > yy2) ) {
         alpha2 *= -1;
     }
      if( (xx1 > xx2) || (yy1 > yy2) ) {
         alpha2 *= -1;
     }

-

     Rect r = { yyc - rad, xxc - rad, yyc + rad, xxc + rad };
     Rect r = { yyc - rad, xxc - rad, yyc + rad, xxc + rad };

-

     if(m_brush.GetStyle() != wxTRANSPARENT) {
         MacInstallBrush();
         PaintArc(&r, alpha1, alpha2);
     if(m_brush.GetStyle() != wxTRANSPARENT) {
         MacInstallBrush();
         PaintArc(&r, alpha1, alpha2);


@@ -666,31 +755,28 @@ void  wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
         FrameArc(&r, alpha1, alpha2);
     }
 }
         FrameArc(&r, alpha1, alpha2);
     }
 }

-

 void  wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                                    double sa, double ea )
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc  Invalid DC"));
 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
     Rect r;
     double angle = sa - ea;  // Order important Mac in opposite direction to wx

- 
-    wxCoord xx = XLOG2DEV(x);
-    wxCoord yy = YLOG2DEV(y);
+    // we have to make sure that the filling is always counter-clockwise
+    if ( angle > 0 )
+        angle -= 360 ;
+    wxCoord xx = XLOG2DEVMAC(x);
+    wxCoord yy = YLOG2DEVMAC(y);

     wxCoord ww = m_signX * XLOG2DEVREL(w);
     wxCoord hh = m_signY * YLOG2DEVREL(h);
     wxCoord ww = m_signX * XLOG2DEVREL(w);
     wxCoord hh = m_signY * YLOG2DEVREL(h);

-

     // handle -ve width and/or height
     if (ww < 0) { ww = -ww; xx = xx - ww; }
     if (hh < 0) { hh = -hh; yy = yy - hh; }
     // handle -ve width and/or height
     if (ww < 0) { ww = -ww; xx = xx - ww; }
     if (hh < 0) { hh = -hh; yy = yy - hh; }

-

     sa = wxConvertWXangleToMACangle(sa);
     sa = wxConvertWXangleToMACangle(sa);

-

     r.top    = yy;
     r.left   = xx;
     r.bottom = yy + hh;
     r.right  = xx + ww;
     r.top    = yy;
     r.left   = xx;
     r.bottom = yy + hh;
     r.right  = xx + ww;

-

     if(m_brush.GetStyle() != wxTRANSPARENT) {
         MacInstallBrush();
         PaintArc(&r, (short)sa, (short)angle);
     if(m_brush.GetStyle() != wxTRANSPARENT) {
         MacInstallBrush();
         PaintArc(&r, (short)sa, (short)angle);


@@ -700,210 +786,177 @@ void  wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
         FrameArc(&r, (short)sa, (short)angle);
     }
 }
         FrameArc(&r, (short)sa, (short)angle);
     }
 }

-

 void  wxDC::DoDrawPoint( wxCoord x, wxCoord y )
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
 void  wxDC::DoDrawPoint( wxCoord x, wxCoord y )
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));

-       

   wxMacPortSetter helper(this) ;
   wxMacPortSetter helper(this) ;

-  
-  if (m_pen.GetStyle() != wxTRANSPARENT) 
+  if (m_pen.GetStyle() != wxTRANSPARENT)

   {
   {

-               MacInstallPen() ;
-        wxCoord xx1 = XLOG2DEV(x); 
-        wxCoord yy1 = YLOG2DEV(y);
-       
-               ::MoveTo(xx1,yy1);
-               ::LineTo(xx1+1, yy1+1);
+        wxCoord xx1 = XLOG2DEVMAC(x);
+        wxCoord yy1 = YLOG2DEVMAC(y);
+        RGBColor pencolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel());
+        ::SetCPixel( xx1,yy1,&pencolor) ;
+        CalcBoundingBox(x, y);

   }
 }
   }
 }

-

 void  wxDC::DoDrawLines(int n, wxPoint points[],
                              wxCoord xoffset, wxCoord yoffset)
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
   wxMacPortSetter helper(this) ;
 void  wxDC::DoDrawLines(int n, wxPoint points[],
                              wxCoord xoffset, wxCoord yoffset)
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
   wxMacPortSetter helper(this) ;

-  
-  if (m_pen.GetStyle() == wxTRANSPARENT) 
+  if (m_pen.GetStyle() == wxTRANSPARENT)

        return;
        return;

-

   MacInstallPen() ;
   MacInstallPen() ;

-  

   wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
                       m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ;
   wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
                       m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ;

-

   wxCoord x1, x2 , y1 , y2 ;
   wxCoord x1, x2 , y1 , y2 ;

-  x1 = XLOG2DEV(points[0].x + xoffset);
-  y1 = YLOG2DEV(points[0].y + yoffset);   
+  x1 = XLOG2DEVMAC(points[0].x + xoffset);
+  y1 = YLOG2DEVMAC(points[0].y + yoffset);

   ::MoveTo(x1 - offset, y1 - offset );
   ::MoveTo(x1 - offset, y1 - offset );

-  

   for (int i = 0; i < n-1; i++)
   {
   for (int i = 0; i < n-1; i++)
   {

-    x2 = XLOG2DEV(points[i+1].x + xoffset);
-    y2 = YLOG2DEV(points[i+1].y + yoffset);
+    x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
+    y2 = YLOG2DEVMAC(points[i+1].y + yoffset);

     ::LineTo( x2 - offset, y2 - offset );
   }
 }
     ::LineTo( x2 - offset, y2 - offset );
   }
 }

-

 void  wxDC::DoDrawPolygon(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) ;
-  
-  PolyHandle polygon = OpenPoly() ;
-  wxCoord x1, x2 , y1 , y2 ;
-  x1 = XLOG2DEV(points[0].x + xoffset);
-  y1 = YLOG2DEV(points[0].y + yoffset);   
-  ::MoveTo(x1,y1);
-  
-  for (int i = 0; i < n-1; i++)
-  {
-    x2 = XLOG2DEV(points[i+1].x + xoffset);
-    y2 = YLOG2DEV(points[i+1].y + yoffset);
-    ::LineTo(x2, y2);
-  }
-
-  ClosePoly() ;
-       if (m_brush.GetStyle() != wxTRANSPARENT) 
+       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();
+       x2 = x1 = XLOG2DEVMAC(points[0].x + xoffset);
+       y2 = y1 = YLOG2DEVMAC(points[0].y + yoffset);
+       ::MoveTo(x1,y1);
+       for (int i = 1; i < n; i++)

        {
        {

-               MacInstallBrush() ;
-               ::PaintPoly( polygon ) ;
+               x2 = XLOG2DEVMAC(points[i].x + xoffset);
+               y2 = YLOG2DEVMAC(points[i].y + yoffset);
+               ::LineTo(x2, y2);
+       }
+    // close the polyline if necessary
+    if ( x1 != x2 || y1 != y2 )
+    {
+        ::LineTo(x1,y1 ) ;
+    }
+       ClosePoly();
+       if (m_brush.GetStyle() != wxTRANSPARENT)
+       {
+               MacInstallBrush();
+               ::PaintPoly( polygon );

        }
        }

-       
-       if (m_pen.GetStyle() != wxTRANSPARENT) 
+       if (m_pen.GetStyle() != wxTRANSPARENT)

        {
                MacInstallPen() ;
                ::FramePoly( polygon ) ;
        }
        {
                MacInstallPen() ;
                ::FramePoly( polygon ) ;
        }

-  KillPoly( polygon ) ;
+       KillPoly( polygon );

 }
 }

-

 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
     wxMacPortSetter helper(this) ;
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
     wxMacPortSetter helper(this) ;

-
-       wxCoord xx = XLOG2DEV(x);
-       wxCoord yy = YLOG2DEV(y);
+       wxCoord xx = XLOG2DEVMAC(x);
+       wxCoord yy = YLOG2DEVMAC(y);

        wxCoord ww = m_signX * XLOG2DEVREL(width);
        wxCoord hh = m_signY * YLOG2DEVREL(height);
        wxCoord ww = m_signX * XLOG2DEVREL(width);
        wxCoord hh = m_signY * YLOG2DEVREL(height);

-       

        // CMB: draw nothing if transformed w or h is 0
        // CMB: draw nothing if transformed w or h is 0

-       if (ww == 0 || hh == 0) 
+       if (ww == 0 || hh == 0)

                return;
                return;

-       

        // CMB: handle -ve width and/or height
        // 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 } ;
        Rect rect = { yy , xx , yy + hh , xx + ww } ;

-       
-       if (m_brush.GetStyle() != wxTRANSPARENT) 
+       if (m_brush.GetStyle() != wxTRANSPARENT)

        {
                MacInstallBrush() ;
                ::PaintRect( &rect ) ;
        }
        {
                MacInstallBrush() ;
                ::PaintRect( &rect ) ;
        }

-       
-       if (m_pen.GetStyle() != wxTRANSPARENT) 
+       if (m_pen.GetStyle() != wxTRANSPARENT)

        {
                MacInstallPen() ;
                ::FrameRect( &rect ) ;
        }
 }
        {
                MacInstallPen() ;
                ::FrameRect( &rect ) ;
        }
 }

-

 void  wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
                                         wxCoord width, wxCoord height,
                                         double radius)
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
     wxMacPortSetter helper(this) ;
 void  wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
                                         wxCoord width, wxCoord height,
                                         double radius)
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
     wxMacPortSetter helper(this) ;

-       
-    if (radius < 0.0) 
+    if (radius < 0.0)

            radius = - radius * ((width < height) ? width : height);
            radius = - radius * ((width < height) ? width : height);

-       
-       wxCoord xx = XLOG2DEV(x);
-       wxCoord yy = YLOG2DEV(y);
+       wxCoord xx = XLOG2DEVMAC(x);
+       wxCoord yy = YLOG2DEVMAC(y);

        wxCoord ww = m_signX * XLOG2DEVREL(width);
        wxCoord hh = m_signY * YLOG2DEVREL(height);
        wxCoord ww = m_signX * XLOG2DEVREL(width);
        wxCoord hh = m_signY * YLOG2DEVREL(height);

-       

        // CMB: draw nothing if transformed w or h is 0
        // CMB: draw nothing if transformed w or h is 0

-       if (ww == 0 || hh == 0) 
+       if (ww == 0 || hh == 0)

                return;
                return;

-       

        // CMB: handle -ve width and/or height
        // 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 } ;
        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) ) ;
        }
        {
                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) ) ;
        }
 }
        {
                MacInstallPen() ;
                ::FrameRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ;
        }
 }

-

 void  wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
     wxMacPortSetter helper(this) ;
 void  wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
     wxMacPortSetter helper(this) ;

-
-       wxCoord xx = XLOG2DEV(x);
-       wxCoord yy = YLOG2DEV(y);
+       wxCoord xx = XLOG2DEVMAC(x);
+       wxCoord yy = YLOG2DEVMAC(y);

        wxCoord ww = m_signX * XLOG2DEVREL(width);
        wxCoord hh = m_signY * YLOG2DEVREL(height);
        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)
                return;
        // CMB: draw nothing if transformed w or h is 0
        if (ww == 0 || hh == 0)
                return;

-

        // CMB: handle -ve width and/or height
        if (ww < 0)
        {
                ww = -ww;
                xx = xx - ww;
        }
        // CMB: handle -ve width and/or height
        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 } ;
        Rect rect = { yy , xx , yy + hh , xx + ww } ;

-

        if (m_brush.GetStyle() != wxTRANSPARENT)
        {
                MacInstallBrush() ;
                ::PaintOval( &rect ) ;
        }
        if (m_brush.GetStyle() != wxTRANSPARENT)
        {
                MacInstallBrush() ;
                ::PaintOval( &rect ) ;
        }

-

        if (m_pen.GetStyle() != wxTRANSPARENT)
        {
                MacInstallPen() ;
        if (m_pen.GetStyle() != wxTRANSPARENT)
        {
                MacInstallPen() ;


@@ -912,291 +965,524 @@ void  wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 }
 
 
 }
 
 

-    
-bool  wxDC::CanDrawBitmap(void) const 
+bool  wxDC::CanDrawBitmap(void) const

 {
        return true ;
 }
 
 {
        return true ;
 }
 

-

 bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-                        wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask )
+                        wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask,
+                        wxCoord xsrcMask,  wxCoord ysrcMask )

 {
     wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc"));
     wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit  Illegal source DC"));
 {
     wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc"));
     wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit  Illegal source DC"));

-    wxMacPortSetter helper(this) ;
-
+    if ( logical_func == wxNO_OP )
+        return TRUE ;
+    if (xsrcMask == -1 && ysrcMask == -1)
+    {
+        xsrcMask = xsrc; ysrcMask = ysrc;
+    }
+    // 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)  ;
+       srcrect.right = source->XLOG2DEVMAC(xsrc + width ) ;
+       srcrect.bottom = source->YLOG2DEVMAC(ysrc + height) ;
+       dstrect.top = YLOG2DEVMAC(ydest) ;
+       dstrect.left = XLOG2DEVMAC(xdest) ;
+       dstrect.bottom = YLOG2DEVMAC(ydest + height )  ;
+       dstrect.right = XLOG2DEVMAC(xdest + width ) ;
+    short mode = kUnsupportedMode ;
+    bool invertDestinationFirst = false ;
+    switch ( logical_func )
+    {
+               case wxAND:        // src AND dst
+                   mode = srcOr ; // ok
+                   break ;
+               case wxAND_INVERT: // (NOT src) AND dst
+                   mode = notSrcOr  ; // ok
+                   break ;
+               case wxAND_REVERSE:// src AND (NOT dst)
+                   invertDestinationFirst = true ;
+                   mode = srcOr ;
+                   break ;
+               case wxCLEAR:      // 0
+                   mode = kEmulatedMode ;
+                   break ;
+        case wxCOPY:       // src
+                       mode = srcCopy ; // ok
+                       break ;
+               case wxEQUIV:      // (NOT src) XOR dst
+                   mode = srcXor ; // ok
+                   break ;
+               case wxINVERT:     // NOT dst
+                       mode = kEmulatedMode ; //or hilite ;
+                       break ;
+               case wxNAND:       // (NOT src) OR (NOT dst)
+                   invertDestinationFirst = true ;
+                   mode = srcBic ;
+                   break ;
+               case wxNOR:        // (NOT src) AND (NOT dst)
+                   invertDestinationFirst = true ;
+                   mode = notSrcOr ;
+                   break ;
+               case wxNO_OP:      // dst
+                   mode = kEmulatedMode ; // this has already been handled upon entry
+                   break ;
+               case wxOR:         // src OR dst
+                   mode = notSrcBic ;
+                   break ;
+               case wxOR_INVERT:  // (NOT src) OR dst
+                   mode = srcBic ;
+                   break ;
+               case wxOR_REVERSE: // src OR (NOT dst)
+                   invertDestinationFirst = true ;
+                       mode = notSrcBic ;
+                       break ;
+               case wxSET:        // 1
+                   mode = kEmulatedMode ;
+                   break ;
+               case wxSRC_INVERT: // (NOT src)
+                       mode = notSrcCopy ; // ok
+                       break ;
+               case wxXOR:        // src XOR dst
+                       mode = notSrcXor ; // ok
+                       break ;
+        default :
+                       break ;
+    }
+    if ( mode == kUnsupportedMode )
+    {
+        wxFAIL_MSG("unsupported blitting mode" );
+        return FALSE ;
+    }

        CGrafPtr                        sourcePort = (CGrafPtr) source->m_macPort ;
        CGrafPtr                        sourcePort = (CGrafPtr) source->m_macPort ;

-       PixMapHandle    bmappixels =  GetGWorldPixMap( sourcePort ) ; 
-       RGBColor        white = { 0xFFFF, 0xFFFF,0xFFFF} ;
-       RGBColor        black = { 0,0,0} ;
-       RGBColor        forecolor = m_textForegroundColour.GetPixel();
-       RGBColor        backcolor = m_textBackgroundColour.GetPixel();
-       RGBForeColor( &forecolor ) ;
-       RGBBackColor( &backcolor ) ;
-
+       PixMapHandle    bmappixels =  GetGWorldPixMap( sourcePort ) ;

        if ( LockPixels(bmappixels) )
        {
        if ( LockPixels(bmappixels) )
        {

-               Rect srcrect , dstrect ;
-               srcrect.top = source->YLOG2DEV(ysrc) ;
-               srcrect.left = source->XLOG2DEV(xsrc) ;
-               srcrect.right = source->XLOG2DEV(xsrc + width ) ;
-               srcrect.bottom = source->YLOG2DEV(ysrc + height) ;
-               dstrect.top = YLOG2DEV(ydest) ;
-               dstrect.left = XLOG2DEV(xdest) ;
-               dstrect.bottom = YLOG2DEV(ydest + height )  ;
-               dstrect.right = XLOG2DEV(xdest + width ) ;
-
-       short  mode = (logical_func == wxCOPY ? srcCopy :
- //    logical_func == wxCLEAR ? WHITENESS :
- //    logical_func == wxSET ? BLACKNESS :
-               logical_func == wxINVERT ? hilite :
-  //   logical_func == wxAND ? MERGECOPY :
-       logical_func == wxOR ? srcOr :
-       logical_func == wxSRC_INVERT ? notSrcCopy :
-       logical_func == wxXOR ? srcXor :
-  //   logical_func == wxOR_REVERSE ? MERGEPAINT :
-  //   logical_func == wxAND_REVERSE ? SRCERASE :
-  //   logical_func == wxSRC_OR ? srcOr :
-  //   logical_func == wxSRC_AND ? SRCAND :
-               srcCopy );
-
+        wxMacPortSetter helper(this) ;
+       if ( source->GetDepth() == 1 )
+       {
+           RGBForeColor( &MAC_WXCOLORREF(m_textForegroundColour.GetPixel()) ) ;
+           RGBBackColor( &MAC_WXCOLORREF(m_textBackgroundColour.GetPixel()) ) ;
+        }
+        else
+        {
+            // the modes need this, otherwise we'll end up having really nice colors...
+           RGBColor    white = { 0xFFFF, 0xFFFF,0xFFFF} ;
+           RGBColor    black = { 0,0,0} ;
+           RGBForeColor( &black ) ;
+           RGBBackColor( &white ) ;
+        }

                if ( useMask && source->m_macMask )
                {
                if ( useMask && source->m_macMask )
                {

-                       wxASSERT( mode == srcCopy ) ;
-                       if ( LockPixels( GetGWorldPixMap( source->m_macMask ) ) )
-                       {
-                               CopyMask( GetPortBitMapForCopyBits( sourcePort ) , 
-                                           GetPortBitMapForCopyBits( source->m_macMask ) , 
-                                           GetPortBitMapForCopyBits( m_macPort ) ,
-                                               &srcrect, &srcrect , &dstrect ) ;
-                               UnlockPixels( GetGWorldPixMap( source->m_macMask )  ) ;
-                       }
+                   if ( mode == srcCopy )
+                   {
+                       if ( LockPixels( GetGWorldPixMap( 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) )  ) ;
+                       }
+                   }
+                   else
+                   {
+                RgnHandle clipRgn = NewRgn() ;
+                LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ;
+                BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ;
+                UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ;
+                OffsetRgn( clipRgn , -srcrect.left + dstrect.left, -srcrect.top +  dstrect.top ) ;
+                if ( mode == kEmulatedMode )
+                {
+                    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 } ;
+                                if ( PtInRgn( dstPoint , clipRgn ) )
+                                {
+                                    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
+                {
+                    if ( invertDestinationFirst )
+                    {
+                        MacInvertRgn( clipRgn ) ;
+                    }
+                               CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,
+                                   GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
+                                       &srcrect, &dstrect, mode, clipRgn ) ;
+                   }
+                   DisposeRgn( clipRgn ) ;
+               }

                }
                else
                {
                }
                else
                {

-                       CopyBits( GetPortBitMapForCopyBits( sourcePort ) , 
-                           GetPortBitMapForCopyBits( m_macPort ) ,
-                               &srcrect, &dstrect, mode, NULL ) ;
+            RgnHandle clipRgn = NewRgn() ;
+            SetRectRgn( clipRgn , dstrect.left , dstrect.top , dstrect.right , dstrect.bottom ) ;
+                   if ( mode == kEmulatedMode )
+                   {
+                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
+               {
+                if ( invertDestinationFirst )
+                {
+                    MacInvertRgn( clipRgn ) ;
+                }
+                       CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,
+                           GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
+                               &srcrect, &dstrect, mode, NULL ) ;
+               }
+               DisposeRgn( clipRgn ) ;

                }
                UnlockPixels( bmappixels ) ;
                }
                UnlockPixels( bmappixels ) ;

-       } 
-       
+       }

        m_macPenInstalled = false ;
        m_macBrushInstalled = false ;
        m_macFontInstalled = false ;
        m_macPenInstalled = false ;
        m_macBrushInstalled = false ;
        m_macFontInstalled = false ;

-       

   return TRUE;
 }
   return TRUE;
 }

+inline Fixed   IntToFixed( int inInt )
+       {
+               return (((SInt32) inInt) << 16);
+       }
+inline int     FixedToInt( Fixed inFixed )
+       {
+               return (((SInt32) inFixed) >> 16);
+       }

 
 

-void  wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,

                               double angle)
 {
     wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText  Invalid window dc") );
                               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;
     }
         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) ;
     wxMacPortSetter helper(this) ;

-
-    // 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 = m_textForegroundColour.GetPixel();
-    RGBColor colBack = 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++ )
+    MacInstallFont() ;
+       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(XLOG2DEV(x + dstX), YLOG2DEV(y + dstY),
-                          textPixel ? &colText : &colBack);
-            }
-        }
+        m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize);
+        SetAntiAliasedTextEnabled(true, SInt16(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" );
+    int iAngle = int( angle );
+    int drawX = XLOG2DEVMAC(x) ;
+    int drawY = YLOG2DEVMAC(y) ;
+    
+    ATSUTextMeasurement textBefore ;
+    ATSUTextMeasurement textAfter ;
+    ATSUTextMeasurement ascent ;
+    ATSUTextMeasurement descent ;
+    
+    
+    if ( abs(iAngle) > 0 )

     {
     {

-        ::MoveTo(XLOG2DEV(x + x4), YLOG2DEV(y + y4 + font->descent));
-        ::LineTo(XLOG2DEV(x + x3), YLOG2DEV(y + y3 + font->descent));
+        Fixed atsuAngle = IntToFixed( iAngle ) ;
+               ATSUAttributeTag atsuTags[] =
+               {
+                   kATSULineRotationTag ,
+               } ;
+           ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+           {
+               sizeof( Fixed ) ,
+           } ;
+               ATSUAttributeValuePtr   atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+               {
+                   &atsuAngle ,
+               } ;
+       status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag),
+                   atsuTags, atsuSizes, atsuValues ) ;

     }
     }

-#endif // 0
-
-    // update the bounding box
-    CalcBoundingBox(x + minX, y + minY);
-    CalcBoundingBox(x + maxX, y + maxY);
+       status = ::ATSUMeasureText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+                                       &textBefore , &textAfter, &ascent , &descent );
+    
+    drawX += sin(angle/RAD2DEG) * FixedToInt(ascent) ;
+    drawY += cos(angle/RAD2DEG) * FixedToInt(ascent) ;
+    status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+                               IntToFixed(drawX) , IntToFixed(drawY) );
+       wxASSERT_MSG( status == noErr , "couldn't draw the rotated text" );
+    Rect rect ;
+       status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+                                       IntToFixed(drawX) , IntToFixed(drawY) , &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"));
     wxMacPortSetter helper(this) ;
 }
 void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText  Invalid DC"));
     wxMacPortSetter helper(this) ;

-
-       long xx = XLOG2DEV(x);
-       long yy = YLOG2DEV(y);
-  
-//     if (m_pen.GetStyle() != wxTRANSPARENT)
+       long xx = XLOG2DEVMAC(x);
+       long yy = YLOG2DEVMAC(y);
+#if TARGET_CARBON
+       bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
+       if ( m_font.GetNoAntiAliasing() )
+           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 ) ;
-               }
-
-               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 ) ;
+               ::TextMode( srcOr) ;
+       }
+       else
+       {
+               ::TextMode( srcCopy ) ;
+       }
+       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)
+               {
+#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 + 10000 } ;
+                    CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+                           if ( m_backgroundMode != wxTRANSPARENT )
+                           {
+                                   Point bounds={0,0} ;
+                                   Rect background = frame ;
+                                   SInt16 baseline ;
+                                       ::GetThemeTextDimensions( mString,
+                                                                               kThemeCurrentPortFont,
+                                                                               kThemeStateActive,
+                                                                               false,
+                                                                               &bounds,
+                                                                               &baseline );
+                                       background.right = background.left + bounds.h ;
+                                       background.bottom = background.top + bounds.v ;
+                                       ::EraseRect( &background ) ;
+                           }
+                       ::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 + 10000 } ;
+            CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
+            if ( m_backgroundMode != wxTRANSPARENT )
+            {
+                   Point bounds={0,0} ;
+                   Rect background = frame ;
+                   SInt16 baseline ;
+                       ::GetThemeTextDimensions( mString,
+                                                               kThemeCurrentPortFont,
+                                                               kThemeStateActive,
+                                                               false,
+                                                               &bounds,
+                                                               &baseline );
+                       background.right = background.left + bounds.h ;
+                       background.bottom = background.top + bounds.v ;
+                       ::EraseRect( &background ) ;
+            }
+               ::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"));
 {
        wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));

-               

        return true ;
 }
        return true ;
 }

-

 void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
                      wxCoord *descent, wxCoord *externalLeading ,
                      wxFont *theFont ) const
 {
    wxCHECK_RET(Ok(), wxT("Invalid DC"));
    wxMacPortSetter helper(this) ;
 void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
                      wxCoord *descent, wxCoord *externalLeading ,
                      wxFont *theFont ) const
 {
    wxCHECK_RET(Ok(), wxT("Invalid DC"));
    wxMacPortSetter helper(this) ;

-
-       wxFont formerFont = m_font ; 
-       
+       wxFont formerFont = m_font ;

        if ( theFont )
        {
        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 ) ;
        FontInfo fi ;
        ::GetFontInfo( &fi ) ;

-
+#if TARGET_CARBON      
+       bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
+       if ( ((wxFont*)&m_font)->GetNoAntiAliasing() )
+           useGetThemeText = false ;
+#endif

        if ( height )
                *height = YDEV2LOGREL( fi.descent + fi.ascent ) ;
        if ( descent )
                *descent =YDEV2LOGREL( fi.descent );
        if ( externalLeading )
                *externalLeading = YDEV2LOGREL( fi.leading ) ;
        if ( height )
                *height = YDEV2LOGREL( fi.descent + fi.ascent ) ;
        if ( descent )
                *descent =YDEV2LOGREL( fi.descent );
        if ( externalLeading )
                *externalLeading = YDEV2LOGREL( fi.leading ) ;

-       

        const char *text = NULL ;
        int length = 0 ;
        wxString macText ;
        const char *text = NULL ;
        int length = 0 ;
        wxString macText ;


@@ -1205,27 +1491,44 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
                macText = wxMacMakeMacStringFromPC( string ) ;
                text = macText ;
                length = macText.Length() ;
                macText = wxMacMakeMacStringFromPC( string ) ;
                text = macText ;
                length = macText.Length() ;

-       }
+       } 

        else
        {
                text = string ;
                length = string.Length() ;
        }
        else
        {
                text = string ;
                length = string.Length() ;
        }

-       

        int laststop = 0 ;
        int i = 0 ;
        int curwidth = 0 ;
        if ( width )
        {
                *width = 0 ;
        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 ) ;
                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 ;
                                if ( curwidth > *width )
                                        *width = XDEV2LOGREL( curwidth ) ;
                                laststop = i+1 ;


@@ -1233,107 +1536,135 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
                        i++ ;
                }
                                
                        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 ( curwidth > *width )
                        *width = XDEV2LOGREL( curwidth ) ;
        }

-

        if ( theFont )
        {
        if ( theFont )
        {

+           // work around the constness
+       *((wxFont*)(&m_font)) = formerFont ;

                m_macFontInstalled = false ;
        }
 }
                m_macFontInstalled = false ;
        }
 }

-

 wxCoord   wxDC::GetCharWidth(void) const
 {
     wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
 wxCoord   wxDC::GetCharWidth(void) const
 {
     wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));

- 

    wxMacPortSetter helper(this) ;
    wxMacPortSetter helper(this) ;

-

        MacInstallFont() ;
        MacInstallFont() ;

-
-       FontInfo fi ;
-       ::GetFontInfo( &fi ) ;
-
-       return YDEV2LOGREL((fi.descent + fi.ascent) / 2) ;
+    int width = 0 ;
+#if TARGET_CARBON
+       bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
+       if ( ((wxFont*)&m_font)->GetNoAntiAliasing() )
+               useGetThemeText = false ;
+#endif
+       char text[] = "H" ;
+#if TARGET_CARBON
+    if ( useGetThemeText )
+    {
+        Point bounds={0,0} ;
+        SInt16 baseline ;
+        CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text , 1 , CFStringGetSystemEncoding(), false ) ;
+               ::GetThemeTextDimensions( mString,
+                                                       kThemeCurrentPortFont,
+                                                       kThemeStateActive,
+                                                       false,
+                                                       &bounds,
+                                                       &baseline );
+           CFRelease( mString ) ;
+           width = bounds.h ;
+    }
+    else
+#endif
+    {
+           width = ::TextWidth( text , 0 , 1 ) ;
+       }
+       return YDEV2LOGREL(width) ;

 }
 }

-

 wxCoord   wxDC::GetCharHeight(void) const
 {
     wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
 wxCoord   wxDC::GetCharHeight(void) const
 {
     wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));

- 

     wxMacPortSetter helper(this) ;
     wxMacPortSetter helper(this) ;

-

        MacInstallFont() ;
        MacInstallFont() ;

-

        FontInfo fi ;
        ::GetFontInfo( &fi ) ;
        FontInfo fi ;
        ::GetFontInfo( &fi ) ;

-

        return YDEV2LOGREL( fi.descent + fi.ascent );
 }
        return YDEV2LOGREL( fi.descent + fi.ascent );
 }

-

 void  wxDC::Clear(void)
 {
 void  wxDC::Clear(void)
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));  
+    wxCHECK_RET(Ok(), wxT("Invalid DC"));

     wxMacPortSetter helper(this) ;
     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)

        {
        {

-               MacInstallBrush() ;
+           ::PenNormal() ;
+           //MacInstallBrush() ;
+        MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ;

                ::EraseRect( &rect ) ;
        }
 }
                ::EraseRect( &rect ) ;
        }
 }

-

 void wxDC::MacInstallFont() const
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
 //     if ( m_macFontInstalled )
 //             return ;
        Pattern blackColor ;
 void wxDC::MacInstallFont() const
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
 //     if ( m_macFontInstalled )
 //             return ;
        Pattern blackColor ;

-       
+       MacSetupBackgroundForCurrentPort(m_backgroundBrush) ;

        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;

-

        if ( font )
        {
                ::TextFont( font->m_macFontNum ) ;
                ::TextSize( short(m_scaleY * font->m_macFontSize) ) ;
                ::TextFace( font->m_macFontStyle ) ;
        if ( font )
        {
                ::TextFont( font->m_macFontNum ) ;
                ::TextSize( short(m_scaleY * font->m_macFontSize) ) ;
                ::TextFace( font->m_macFontStyle ) ;

-       

                m_macFontInstalled = true ;
                m_macBrushInstalled = false ;
                m_macPenInstalled = false ;
                m_macFontInstalled = true ;
                m_macBrushInstalled = false ;
                m_macPenInstalled = false ;

-
-               RGBColor forecolor = m_textForegroundColour.GetPixel();
-               RGBColor backcolor = m_textBackgroundColour.GetPixel();
+               RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel());
+               RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel());

                ::RGBForeColor( &forecolor );
                ::RGBBackColor( &backcolor );
        }
        else
        {
                ::RGBForeColor( &forecolor );
                ::RGBBackColor( &backcolor );
        }
        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
                // todo reset after spacing changes - or store the current spacing somewhere

-       

                m_macFontInstalled = true ;
                m_macBrushInstalled = false ;
                m_macPenInstalled = false ;
                m_macFontInstalled = true ;
                m_macBrushInstalled = false ;
                m_macPenInstalled = false ;

-
-               RGBColor forecolor = m_textForegroundColour.GetPixel();
-               RGBColor backcolor = m_textBackgroundColour.GetPixel();
+               RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel());
+               RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel());

                ::RGBForeColor( &forecolor );
                ::RGBBackColor( &backcolor );
        }
                ::RGBForeColor( &forecolor );
                ::RGBBackColor( &backcolor );
        }

-

        short mode = patCopy ;
        short mode = patCopy ;

-

        // todo :
        // todo :

-       

        switch( m_logicalFunction )
        {
                case wxCOPY:       // src
        switch( m_logicalFunction )
        {
                case wxCOPY:       // src


@@ -1352,9 +1683,7 @@ void wxDC::MacInstallFont() const
                case wxSRC_INVERT: // (NOT src)
                        mode = notPatCopy ;
                        break ;
                case wxSRC_INVERT: // (NOT src)
                        mode = notPatCopy ;
                        break ;

-

                // unsupported TODO
                // unsupported TODO

-

                case wxCLEAR:      // 0
                case wxAND_REVERSE:// src AND (NOT dst)
                case wxAND:        // src AND dst
                case wxCLEAR:      // 0
                case wxAND_REVERSE:// src AND (NOT dst)
                case wxAND:        // src AND dst


@@ -1371,63 +1700,115 @@ void wxDC::MacInstallFont() const
                        break ;
        }
        ::PenMode( mode ) ;
                        break ;
        }
        ::PenMode( mode ) ;

-}
-
+    OSStatus status = noErr ;
+    Fixed atsuSize = IntToFixed( int(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)
 {
 static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 {

-       int thePatListID = sysPatListID;
-       int theIndex;
+       int theIndex = 1 ;

        switch(hatchStyle)
        {
                case wxBDIAGONAL_HATCH:
        switch(hatchStyle)
        {
                case wxBDIAGONAL_HATCH:

-                       theIndex = 34; // WCH: this is not good
+                       theIndex = 2;

                        break;
                case wxFDIAGONAL_HATCH:
                        break;
                case wxFDIAGONAL_HATCH:

-                       theIndex = 26;
+                       theIndex = 3;

                        break;
                case wxCROSS_HATCH:
                        break;
                case wxCROSS_HATCH:

-                       theIndex = 5;
+                       theIndex = 4;

                        break;
                case wxHORIZONTAL_HATCH:
                        break;
                case wxHORIZONTAL_HATCH:

-                       theIndex = 25;
+                       theIndex = 5;

                        break;
                case wxVERTICAL_HATCH:
                        theIndex = 6;
                        break;
                case wxCROSSDIAG_HATCH:
                        break;
                case wxVERTICAL_HATCH:
                        theIndex = 6;
                        break;
                case wxCROSSDIAG_HATCH:

-                       theIndex = 4; // WCH: this is not good
+                       theIndex = 7;

                        break;
                default:
                        theIndex = 1; // solid pattern
                        break;
        }
                        break;
                default:
                        theIndex = 1; // solid pattern
                        break;
        }

-       GetIndPattern( pattern, thePatListID, theIndex);        
+       *pattern = gHatchPatterns[theIndex-1] ;

 }
 }

-

 void wxDC::MacInstallPen() const
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
 void wxDC::MacInstallPen() const
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));

-

        Pattern  blackColor;
        Pattern  blackColor;

-

 //     if ( m_macPenInstalled )
 //             return ;
 //     if ( m_macPenInstalled )
 //             return ;

-
-       RGBColor forecolor = m_pen.GetColour().GetPixel();
-       RGBColor backcolor = m_backgroundBrush.GetColour().GetPixel();
+       RGBColor forecolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel());
+       RGBColor backcolor = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel());

        ::RGBForeColor( &forecolor );
        ::RGBBackColor( &backcolor );
        ::RGBForeColor( &forecolor );
        ::RGBBackColor( &backcolor );

-       

        ::PenNormal() ;
        int penWidth = m_pen.GetWidth() * (int) m_scaleX ;
        ::PenNormal() ;
        int penWidth = m_pen.GetWidth() * (int) m_scaleX ;

-

        // null means only one pixel, at whatever resolution
        if ( penWidth == 0 )
        // null means only one pixel, at whatever resolution
        if ( penWidth == 0 )

-               penWidth = 1 ; 
+               penWidth = 1 ;

        ::PenSize(penWidth, penWidth);
        ::PenSize(penWidth, penWidth);

-

        int penStyle = m_pen.GetStyle();
        int penStyle = m_pen.GetStyle();

-       

        if (penStyle == wxSOLID)
        {
                ::PenPat(GetQDGlobalsBlack(&blackColor));
        if (penStyle == wxSOLID)
        {
                ::PenPat(GetQDGlobalsBlack(&blackColor));


@@ -1440,20 +1821,58 @@ void wxDC::MacInstallPen() const
        }
        else
        {
        }
        else
        {

-               ::PenPat(GetQDGlobalsBlack(&blackColor));
+           Pattern pat = *GetQDGlobalsBlack(&blackColor) ;
+           switch( penStyle )
+           {
+               case wxDOT :
+                for ( int i = 0 ; i < 8 ; ++i )
+                {
+                    pat.pat[i] = 0xCC ;
+                }
+                   break ;
+               case wxLONG_DASH :
+                for ( int i = 0 ; i < 8 ; ++i )
+                {
+                    pat.pat[i] = 0xFE ;
+                }
+                   break ;
+               case wxSHORT_DASH :
+                for ( int i = 0 ; i < 8 ; ++i )
+                {
+                    pat.pat[i] = 0xEE ;
+                }
+                   break ;
+               case wxDOT_DASH :
+                for ( int i = 0 ; i < 8 ; ++i )
+                {
+                    pat.pat[i] = 0x6F ;
+                }
+                   break ;
+               case wxUSER_DASH :
+                   {
+                       wxDash* dash ;
+                    m_pen.GetDashes(&dash) ;
+                       // right now we don't allocate larger pixmaps
+                       // int number = 
+                       m_pen.GetDashes(&dash) ;
+                       for ( int i = 0 ; i < 8 ; ++i )
+                       {
+                           pat.pat[i] = dash[0] ;
+                       }
+                   }
+                   break ;
+           }
+               ::PenPat(&pat);

        }
        }

-

        short mode = patCopy ;
        short mode = patCopy ;

-       

        // todo :
        // todo :

-       

        switch( m_logicalFunction )
        {
        switch( m_logicalFunction )
        {

-               case wxCOPY:       // src
-                       mode = patCopy ;
+               case wxCOPY:       // only foreground color, leave background (thus not patCopy)
+                       mode = patOr ;

                        break ;
                case wxINVERT:     // NOT dst
                        break ;
                case wxINVERT:     // NOT dst

-                       ::PenPat(GetQDGlobalsBlack(&blackColor));
+//                     ::PenPat(GetQDGlobalsBlack(&blackColor));

                        mode = patXor ;
                        break ;
                case wxXOR:        // src XOR dst
                        mode = patXor ;
                        break ;
                case wxXOR:        // src XOR dst


@@ -1465,9 +1884,7 @@ void wxDC::MacInstallPen() const
                case wxSRC_INVERT: // (NOT src)
                        mode = notPatCopy ;
                        break ;
                case wxSRC_INVERT: // (NOT src)
                        mode = notPatCopy ;
                        break ;

-

                // unsupported TODO
                // unsupported TODO

-

                case wxCLEAR:      // 0
                case wxAND_REVERSE:// src AND (NOT dst)
                case wxAND:        // src AND dst
                case wxCLEAR:      // 0
                case wxAND_REVERSE:// src AND (NOT dst)
                case wxAND:        // src AND dst


@@ -1488,64 +1905,152 @@ void wxDC::MacInstallPen() const
        m_macBrushInstalled = false ;
        m_macFontInstalled = false ;
 }
        m_macBrushInstalled = false ;
        m_macFontInstalled = false ;
 }

-
+void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background )
+{
+    Pattern whiteColor ;
+    switch( background.MacGetBrushKind() )
+    {
+      case kwxMacBrushTheme :
+        {
+               ::SetThemeBackground( background.GetMacTheme() , wxDisplayDepth() , true ) ;
+          break ;
+        }
+      case kwxMacBrushThemeBackground :
+        {
+               Rect extent ;
+               ThemeBackgroundKind bg = background.GetMacThemeBackground( &extent ) ;
+               ::ApplyThemeBackground( bg , &extent ,kThemeStateActive , wxDisplayDepth() , true ) ;
+          break ;
+        }
+      case kwxMacBrushColour :
+        {
+                   ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) );
+               int brushStyle = background.GetStyle();
+               if (brushStyle == wxSOLID)
+                       ::BackPat(GetQDGlobalsWhite(&whiteColor));
+               else if (IS_HATCH(brushStyle))
+               {
+                       Pattern pat ;
+                       wxMacGetHatchPattern(brushStyle, &pat);
+                       ::BackPat(&pat);
+               }
+               else
+               {
+                       ::BackPat(GetQDGlobalsWhite(&whiteColor));
+               }
+          break ;
+        }
+    }
+}

 void wxDC::MacInstallBrush() const
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
 void wxDC::MacInstallBrush() const
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));

-
-       Pattern  blackColor, whiteColor ;
+       Pattern  blackColor ;

 //     if ( m_macBrushInstalled )
 //             return ;
 //     if ( m_macBrushInstalled )
 //             return ;

-

        // foreground
        // foreground

-
-       RGBColor forecolor = m_brush.GetColour().GetPixel();
-       RGBColor backcolor = m_backgroundBrush.GetColour().GetPixel();
-       ::RGBForeColor( &forecolor );
-       ::RGBBackColor( &backcolor );
-
+       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)
        int brushStyle = m_brush.GetStyle();
        if (brushStyle == wxSOLID)

+       {

                ::PenPat(GetQDGlobalsBlack(&blackColor));
                ::PenPat(GetQDGlobalsBlack(&blackColor));

+    }

        else if (IS_HATCH(brushStyle))
        {
                Pattern pat ;
                wxMacGetHatchPattern(brushStyle, &pat);
                ::PenPat(&pat);
        }
        else if (IS_HATCH(brushStyle))
        {
                Pattern pat ;
                wxMacGetHatchPattern(brushStyle, &pat);
                ::PenPat(&pat);
        }

-       else
-       {
-               ::PenPat(GetQDGlobalsBlack(&blackColor));
-       }
-
-       
-       // background
-       
-       brushStyle = m_backgroundBrush.GetStyle();
-       if (brushStyle == wxSOLID)
-               ::BackPat(GetQDGlobalsWhite(&whiteColor));
-       else if (IS_HATCH(brushStyle))
+       else if ( m_brush.GetStyle() == wxSTIPPLE || m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )

        {
        {

-               Pattern pat ;
-               wxMacGetHatchPattern(brushStyle, &pat);
-               ::BackPat(&pat);
+           // we force this in order to be compliant with wxMSW
+           backgroundTransparent = false ;
+           // for these the text fore (and back for MASK_OPAQUE) colors are used
+           wxBitmap* bitmap = m_brush.GetStipple() ;
+           int width = bitmap->GetWidth() ;
+           int height = bitmap->GetHeight() ;
+        GWorldPtr gw = NULL ;
+           if ( m_brush.GetStyle() == wxSTIPPLE )
+               gw = MAC_WXHBITMAP(bitmap->GetHBITMAP())  ;
+           else
+               gw = MAC_WXHBITMAP(bitmap->GetMask()->GetMaskBitmap()) ;
+        PixMapHandle gwpixmaphandle = GetGWorldPixMap( gw ) ;
+        LockPixels( gwpixmaphandle ) ;
+           bool isMonochrome = !IsPortColor( gw ) ;
+        if ( !isMonochrome )
+        {
+            if ( (**gwpixmaphandle).pixelSize == 1 )
+                isMonochrome = true ;
+        }
+        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 ;
+            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;
+            if ( isMonochrome )
+            {
+                   CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ;
+                   ColorSpecPtr ctspec = (ColorSpecPtr) &(**ctable).ctTable ;
+                   if ( ctspec[0].rgb.red == 0x0000 )
+                   {
+                       ctspec[1].rgb = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ;
+                       ctspec[0].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ;
+                   }
+                   else
+                   {
+                       ctspec[0].rgb = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ;
+                       ctspec[1].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ;
+                   }
+                   ::CTabChanged( ctable ) ;
+            }
+            ::PenPixPat(pixpat);
+            m_macForegroundPixMap = pixpat ;
+           }
+           UnlockPixels( gwpixmaphandle ) ;

        }
        }

-       else
-       {
-               ::BackPat(GetQDGlobalsWhite(&whiteColor));
+    else
+    {
+           ::PenPat(GetQDGlobalsBlack(&blackColor));

        }
        }

-       

        short mode = patCopy ;
        short mode = patCopy ;

-
-       // todo :
-       

        switch( m_logicalFunction )
        {
                case wxCOPY:       // src
        switch( m_logicalFunction )
        {
                case wxCOPY:       // src

-                       mode = patCopy ;
+                   if ( backgroundTransparent )
+                       mode = patOr ;
+                   else
+                           mode = patCopy ;

                        break ;
                case wxINVERT:     // NOT dst
                        break ;
                case wxINVERT:     // NOT dst

-                       ::PenPat(GetQDGlobalsBlack(&blackColor));
+                   if ( !backgroundTransparent )
+                   {
+                           ::PenPat(GetQDGlobalsBlack(&blackColor));
+                       }

                        mode = patXor ;
                        break ;
                case wxXOR:        // src XOR dst
                        mode = patXor ;
                        break ;
                case wxXOR:        // src XOR dst


@@ -1557,9 +2062,7 @@ void wxDC::MacInstallBrush() const
                case wxSRC_INVERT: // (NOT src)
                        mode = notPatCopy ;
                        break ;
                case wxSRC_INVERT: // (NOT src)
                        mode = notPatCopy ;
                        break ;

-

                // unsupported TODO
                // unsupported TODO

-

                case wxCLEAR:      // 0
                case wxAND_REVERSE:// src AND (NOT dst)
                case wxAND:        // src AND dst
                case wxCLEAR:      // 0
                case wxAND_REVERSE:// src AND (NOT dst)
                case wxAND:        // src AND dst


@@ -1580,48 +2083,39 @@ void wxDC::MacInstallBrush() const
        m_macPenInstalled = false ;
        m_macFontInstalled = false ;
 }
        m_macPenInstalled = false ;
        m_macFontInstalled = false ;
 }

-

 // ---------------------------------------------------------------------------
 // coordinates transformations
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // coordinates transformations
 // ---------------------------------------------------------------------------
 

-

 wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
 {
     return ((wxDC *)this)->XDEV2LOG(x);
 }
 wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
 {
     return ((wxDC *)this)->XDEV2LOG(x);
 }

-

 wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
 {
     return ((wxDC *)this)->YDEV2LOG(y);
 }
 wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
 {
     return ((wxDC *)this)->YDEV2LOG(y);
 }

-

 wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
 {
     return ((wxDC *)this)->XDEV2LOGREL(x);
 }
 wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
 {
     return ((wxDC *)this)->XDEV2LOGREL(x);
 }

-

 wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
 {
     return ((wxDC *)this)->YDEV2LOGREL(y);
 }
 wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
 {
     return ((wxDC *)this)->YDEV2LOGREL(y);
 }

-

 wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
 {
     return ((wxDC *)this)->XLOG2DEV(x);
 }
 wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
 {
     return ((wxDC *)this)->XLOG2DEV(x);
 }

-

 wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
 {
     return ((wxDC *)this)->YLOG2DEV(y);
 }
 wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
 {
     return ((wxDC *)this)->YLOG2DEV(y);
 }

-

 wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
 {
     return ((wxDC *)this)->XLOG2DEVREL(x);
 }
 wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
 {
     return ((wxDC *)this)->XLOG2DEVREL(x);
 }

-

 wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 {
     return ((wxDC *)this)->YLOG2DEVREL(y);
 wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 {
     return ((wxDC *)this)->YLOG2DEVREL(y);

-}
+}
\ No newline at end of file