Slider Updates

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

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 55578a324f7f56589ff074edb3c9263bb5b20b0f..364c45fcf105dd6edc3f61dd797a38dfdb77d370 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -19,6 +19,7 @@
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/image.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/image.h"

+#include "wx/log.h"

 
 
 #if __MSL__ >= 0x6000
 
 
 #if __MSL__ >= 0x6000


@@ -27,7 +28,9 @@ using namespace std ;
 #endif
 
 #include "wx/mac/private.h"
 #endif
 
 #include "wx/mac/private.h"

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

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


@@ -50,7 +53,18 @@ const double RAD2DEG  = 180.0 / M_PI;
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;
 
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;
 

-#define wxMAC_EXPERIMENTAL_PATTERN 0
+wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
+       m_ph( (GrafPtr) dc->m_macPort )
+{
+       wxASSERT( dc->Ok() ) ;
+       m_dc = dc ;
+       dc->MacSetupPort(&m_ph) ;
+}
+
+wxMacPortSetter::~wxMacPortSetter()
+{
+       m_dc->MacCleanupPort(&m_ph) ;
+}

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


@@ -157,33 +171,33 @@ wxDC::wxDC()
 {
   m_ok = FALSE;
   m_colour = TRUE;
 {
   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_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.x = m_macLocalOrigin.y = 0 ;
        m_macBoundaryClipRgn = NewRgn() ;
        m_macCurrentClipRgn = NewRgn() ;
        m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ;
        m_macBoundaryClipRgn = NewRgn() ;
        m_macCurrentClipRgn = NewRgn() ;


@@ -194,17 +208,11 @@ wxDC::wxDC()
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
     m_brush = *wxWHITE_BRUSH;
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
     m_brush = *wxWHITE_BRUSH;

-}
-wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
-       m_ph( (GrafPtr) dc->m_macPort ) 
-{
-       wxASSERT( dc->Ok() ) ;
-       
-       dc->MacSetupPort(&m_ph) ;
-}
-
-wxMacPortSetter::~wxMacPortSetter() 
-{
+    m_macCurrentPortStateHelper = NULL ;
+    m_macATSUIStyle = NULL ;
+    m_macAliasWasEnabled = false;
+    m_macForegroundPixMap = NULL ;
+    m_macBackgroundPixMap = NULL ;

 }
 
 wxDC::~wxDC(void)
 }
 
 wxDC::~wxDC(void)


@@ -214,28 +222,60 @@ wxDC::~wxDC(void)
 }
 void wxDC::MacSetupPort(wxMacPortStateHelper* help) const
 {
 }
 void wxDC::MacSetupPort(wxMacPortStateHelper* help) const
 {

+    wxASSERT( m_macCurrentPortStateHelper == NULL ) ;
+    m_macCurrentPortStateHelper = help ;

        SetClip( (RgnHandle) m_macCurrentClipRgn);
 
        m_macFontInstalled = false ;
        m_macBrushInstalled = false ;
        SetClip( (RgnHandle) m_macCurrentClipRgn);
 
        m_macFontInstalled = false ;
        m_macBrushInstalled = false ;

-       m_macPenInstalled = false ;     
+       m_macPenInstalled = false ;
+}
+
+void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const
+{
+    wxASSERT( m_macCurrentPortStateHelper == help ) ;
+    m_macCurrentPortStateHelper = NULL ;
+    if( m_macATSUIStyle )
+    {
+        ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle);
+        m_macATSUIStyle = NULL ;
+    }
+    if ( m_macAliasWasEnabled )
+    {
+        SetAntiAliasedTextEnabled(m_macFormerAliasState, m_macFormerAliasSize);
+        m_macAliasWasEnabled = false ;
+    }
+    if ( m_macForegroundPixMap )
+    {
+        Pattern blackColor ;
+        ::PenPat(GetQDGlobalsBlack(&blackColor));
+        DisposePixPat( (PixPatHandle) m_macForegroundPixMap ) ;
+        m_macForegroundPixMap = NULL ;
+    }
+    if ( m_macBackgroundPixMap )
+    {
+        Pattern whiteColor ;
+        ::BackPat(GetQDGlobalsWhite(&whiteColor));
+        DisposePixPat( (PixPatHandle) m_macBackgroundPixMap ) ;
+        m_macBackgroundPixMap = NULL ;
+    }

 }
 
 void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
 {
      wxCHECK_RET( Ok(), wxT("invalid window dc") );
 }
 
 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 = XLOG2DEVMAC(x);
      wxCoord yy = YLOG2DEVMAC(y);
      wxCoord w = bmp.GetWidth();
      wxCoord h = bmp.GetHeight();
      wxCoord ww = XLOG2DEVREL(w);
      wxCoord hh = YLOG2DEVREL(h);
      wxCoord xx = XLOG2DEVMAC(x);
      wxCoord yy = YLOG2DEVMAC(y);
      wxCoord w = bmp.GetWidth();
      wxCoord h = bmp.GetHeight();
      wxCoord ww = XLOG2DEVREL(w);
      wxCoord hh = YLOG2DEVREL(h);

- 
+

      // Set up drawing mode
      short  mode = (m_logicalFunction == wxCOPY ? srcCopy :
                     //m_logicalFunction == wxCLEAR ? WHITENESS :
      // Set up drawing mode
      short  mode = (m_logicalFunction == wxCOPY ? srcCopy :
                     //m_logicalFunction == wxCLEAR ? WHITENESS :


@@ -250,7 +290,7 @@ 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 ) ;


@@ -260,7 +300,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
      {
          GWorldPtr    bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP() );
          PixMapHandle bmappixels ;
      {
          GWorldPtr    bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP() );
          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)
         {


@@ -276,15 +316,15 @@ 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( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap()))))
          if ( useMask && bmp.GetMask() )
          {
              if( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap()))))


@@ -321,9 +361,9 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 {
      wxCHECK_RET(Ok(), wxT("Invalid dc  wxDC::DoDrawIcon"));
 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 )
     DoDrawBitmap( icon , x , y , icon.GetMask() != NULL ) ;
 }
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )


@@ -338,7 +378,7 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 
     SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ;
     SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 
     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 );


@@ -415,7 +455,7 @@ void wxDC::DestroyClippingRegion()
   wxMacPortSetter helper(this) ;
   CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
   m_clipping = FALSE;
   wxMacPortSetter helper(this) ;
   CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
   m_clipping = FALSE;

-}    
+}

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


@@ -443,7 +483,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 );


@@ -522,7 +562,11 @@ wxSize wxDC::GetPPI() const
 
 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()
 }
 
 void wxDC::ComputeScaleAndOrigin()


@@ -537,7 +581,7 @@ void wxDC::ComputeScaleAndOrigin()
   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


@@ -567,7 +611,7 @@ void  wxDC::SetPen( const wxPen &pen )
 {
        if ( m_pen == pen )
                return ;
 {
        if ( m_pen == pen )
                return ;

-               
+

   m_pen = pen;
 
   m_macPenInstalled = false ;
   m_pen = pen;
 
   m_macPenInstalled = false ;


@@ -575,28 +619,28 @@ void  wxDC::SetPen( const wxPen &pen )
 
 void  wxDC::SetBrush( const wxBrush &brush )
 {
 
 void  wxDC::SetBrush( const wxBrush &brush )
 {

-  if (m_brush == brush) 
+  if (m_brush == brush)

        return;
        return;

-  
+

   m_brush = brush;
   m_macBrushInstalled = false ;
 }
 
 void  wxDC::SetBackground( const wxBrush &brush )
 {
   m_brush = brush;
   m_macBrushInstalled = false ;
 }
 
 void  wxDC::SetBackground( const wxBrush &brush )
 {

-  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 ;
 }
 
 void  wxDC::SetLogicalFunction( int function )
 {
        return;
    m_macBrushInstalled = false ;
 }
 
 void  wxDC::SetLogicalFunction( int function )
 {

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

                return;
 
        m_logicalFunction = function ;
                return;
 
        m_logicalFunction = function ;


@@ -605,12 +649,16 @@ void  wxDC::SetLogicalFunction( int function )
        m_macPenInstalled = 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) ;


@@ -630,9 +678,9 @@ bool  wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const
 void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
 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() ;
   if (m_pen.GetStyle() != wxTRANSPARENT)
   {
                MacInstallPen() ;


@@ -664,7 +712,7 @@ 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);
   }


@@ -687,6 +735,10 @@ void  wxDC::DoCrossHair( wxCoord x, wxCoord y )
         ::LineTo( XLOG2DEVMAC(w), yy );
         ::MoveTo( xx, YLOG2DEVMAC(0) );
         ::LineTo( xx, YLOG2DEVMAC(h) );
         ::LineTo( XLOG2DEVMAC(w), yy );
         ::MoveTo( xx, YLOG2DEVMAC(0) );
         ::LineTo( xx, YLOG2DEVMAC(h) );

+
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x+w, y+h);
+

     }
 }
 
     }
 }
 


@@ -786,7 +838,7 @@ void  wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
 
     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 = XLOG2DEVMAC(x);
     wxCoord yy = YLOG2DEVMAC(y);
     wxCoord ww = m_signX * XLOG2DEVREL(w);
     wxCoord xx = XLOG2DEVMAC(x);
     wxCoord yy = YLOG2DEVMAC(y);
     wxCoord ww = m_signX * XLOG2DEVREL(w);


@@ -816,17 +868,16 @@ void  wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
 void  wxDC::DoDrawPoint( wxCoord x, wxCoord y )
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
 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 = XLOG2DEVMAC(x); 
+        wxCoord xx1 = XLOG2DEVMAC(x);

         wxCoord yy1 = YLOG2DEVMAC(y);
         wxCoord yy1 = YLOG2DEVMAC(y);

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

   }
 }
 
   }
 }
 


@@ -835,20 +886,20 @@ void  wxDC::DoDrawLines(int n, wxPoint points[],
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
   wxMacPortSetter helper(this) ;
 {
   wxCHECK_RET(Ok(), wxT("Invalid DC"));
   wxMacPortSetter helper(this) ;

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

        return;
 
   MacInstallPen() ;
        return;
 
   MacInstallPen() ;

-  
+

   wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
                       m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ;
 
   wxCoord x1, x2 , y1 , y2 ;
   x1 = XLOG2DEVMAC(points[0].x + xoffset);
   wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
                       m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ;
 
   wxCoord x1, x2 , y1 , y2 ;
   x1 = XLOG2DEVMAC(points[0].x + xoffset);

-  y1 = YLOG2DEVMAC(points[0].y + yoffset);   
+  y1 = YLOG2DEVMAC(points[0].y + yoffset);

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

-  
+

   for (int i = 0; i < n-1; i++)
   {
     x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
   for (int i = 0; i < n-1; i++)
   {
     x2 = XLOG2DEVMAC(points[i+1].x + xoffset);


@@ -858,21 +909,21 @@ void  wxDC::DoDrawLines(int n, wxPoint points[],
 }
 
 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) ;
 {
        wxCHECK_RET(Ok(), wxT("Invalid DC"));
        wxMacPortSetter helper(this) ;

-       
+

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

-  
+

     if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
         return ;
     if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
         return ;

-        
+

        PolyHandle polygon = OpenPoly();
        PolyHandle polygon = OpenPoly();

-       
+

        x1 = XLOG2DEVMAC(points[0].x + xoffset);
        x1 = XLOG2DEVMAC(points[0].x + xoffset);

-       y1 = YLOG2DEVMAC(points[0].y + yoffset);   
+       y1 = YLOG2DEVMAC(points[0].y + yoffset);

        ::MoveTo(x1,y1);
 
        for (int i = 1; i < n; i++)
        ::MoveTo(x1,y1);
 
        for (int i = 1; i < n; i++)


@@ -887,7 +938,7 @@ void  wxDC::DoDrawPolygon(int n, wxPoint points[],
     {
         ::LineTo(x1,y1 ) ;
     }
     {
         ::LineTo(x1,y1 ) ;
     }

-    
+

        ClosePoly();
 
        if (m_brush.GetStyle() != wxTRANSPARENT)
        ClosePoly();
 
        if (m_brush.GetStyle() != wxTRANSPARENT)


@@ -895,15 +946,15 @@ void  wxDC::DoDrawPolygon(int n, wxPoint points[],
 
                MacInstallBrush();
                ::PaintPoly( polygon );
 
                MacInstallBrush();
                ::PaintPoly( polygon );

-               
+

        }
        }

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

        {
        {

-       
+

                MacInstallPen() ;
                ::FramePoly( polygon ) ;
                MacInstallPen() ;
                ::FramePoly( polygon ) ;

-               
+

        }
        KillPoly( polygon );
 }
        }
        KillPoly( polygon );
 }


@@ -917,33 +968,33 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
        wxCoord yy = YLOG2DEVMAC(y);
        wxCoord ww = m_signX * XLOG2DEVREL(width);
        wxCoord hh = m_signY * YLOG2DEVREL(height);
        wxCoord yy = YLOG2DEVMAC(y);
        wxCoord ww = m_signX * XLOG2DEVREL(width);
        wxCoord hh = m_signY * YLOG2DEVREL(height);

-       
+

        // CMB: draw nothing if transformed w or h is 0
        // 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 ) ;


@@ -956,41 +1007,41 @@ void  wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
 {
     wxCHECK_RET(Ok(), wxT("Invalid DC"));
     wxMacPortSetter helper(this) ;
 {
     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 = XLOG2DEVMAC(x);
        wxCoord yy = YLOG2DEVMAC(y);
        wxCoord ww = m_signX * XLOG2DEVREL(width);
        wxCoord hh = m_signY * YLOG2DEVREL(height);
        wxCoord xx = XLOG2DEVMAC(x);
        wxCoord yy = YLOG2DEVMAC(y);
        wxCoord ww = m_signX * XLOG2DEVREL(width);
        wxCoord hh = m_signY * YLOG2DEVREL(height);

-       
+

        // CMB: draw nothing if transformed w or h is 0
        // 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) ) ;


@@ -1040,8 +1091,8 @@ 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 ;
 }


@@ -1053,7 +1104,7 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 {
     wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc"));
     wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit  Illegal source DC"));
 {
     wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc"));
     wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit  Illegal source DC"));

-    
+

     if ( logical_func == wxNO_OP )
         return TRUE ;
 
     if ( logical_func == wxNO_OP )
         return TRUE ;
 


@@ -1063,10 +1114,10 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     }
 
     // correct the parameter in case this dc does not have a mask at all
     }
 
     // correct the parameter in case this dc does not have a mask at all

-    
+

     if ( useMask && !source->m_macMask )
         useMask = false ;
     if ( useMask && !source->m_macMask )
         useMask = false ;

-        
+

        Rect srcrect , dstrect ;
        srcrect.top = source->YLOG2DEVMAC(ysrc) ;
        srcrect.left = source->XLOG2DEVMAC(xsrc)  ;
        Rect srcrect , dstrect ;
        srcrect.top = source->YLOG2DEVMAC(ysrc) ;
        srcrect.left = source->XLOG2DEVMAC(xsrc)  ;


@@ -1089,10 +1140,10 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                    break ;
                case wxAND_REVERSE:// src AND (NOT dst)
                    invertDestinationFirst = true ;
                    break ;
                case wxAND_REVERSE:// src AND (NOT dst)
                    invertDestinationFirst = true ;

-                   mode = srcOr ; 
+                   mode = srcOr ;

                    break ;
                case wxCLEAR:      // 0
                    break ;
                case wxCLEAR:      // 0

-                   mode = kEmulatedMode ; 
+                   mode = kEmulatedMode ;

                    break ;
         case wxCOPY:       // src
                        mode = srcCopy ; // ok
                    break ;
         case wxCOPY:       // src
                        mode = srcCopy ; // ok


@@ -1105,11 +1156,11 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                        break ;
                case wxNAND:       // (NOT src) OR (NOT dst)
                    invertDestinationFirst = true ;
                        break ;
                case wxNAND:       // (NOT src) OR (NOT dst)
                    invertDestinationFirst = true ;

-                   mode = srcBic ; 
+                   mode = srcBic ;

                    break ;
                case wxNOR:        // (NOT src) AND (NOT dst)
                    invertDestinationFirst = true ;
                    break ;
                case wxNOR:        // (NOT src) AND (NOT dst)
                    invertDestinationFirst = true ;

-                   mode = notSrcOr ; 
+                   mode = notSrcOr ;

                    break ;
                case wxNO_OP:      // dst
                    mode = kEmulatedMode ; // this has already been handled upon entry
                    break ;
                case wxNO_OP:      // dst
                    mode = kEmulatedMode ; // this has already been handled upon entry


@@ -1118,14 +1169,14 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                    mode = notSrcBic ;
                    break ;
                case wxOR_INVERT:  // (NOT src) OR dst
                    mode = notSrcBic ;
                    break ;
                case wxOR_INVERT:  // (NOT src) OR dst

-                   mode = srcBic ; 
+                   mode = srcBic ;

                    break ;
                case wxOR_REVERSE: // src OR (NOT dst)
                    invertDestinationFirst = true ;
                        mode = notSrcBic ;
                        break ;
                case wxSET:        // 1
                    break ;
                case wxOR_REVERSE: // src OR (NOT dst)
                    invertDestinationFirst = true ;
                        mode = notSrcBic ;
                        break ;
                case wxSET:        // 1

-                   mode = kEmulatedMode ; 
+                   mode = kEmulatedMode ;

                    break ;
                case wxSRC_INVERT: // (NOT src)
                        mode = notSrcCopy ; // ok
                    break ;
                case wxSRC_INVERT: // (NOT src)
                        mode = notSrcCopy ; // ok


@@ -1141,17 +1192,16 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 
     if ( mode == kUnsupportedMode )
     {
 
     if ( mode == kUnsupportedMode )
     {

-        wxFAIL_MSG("unsupported blitting mode" )
+        wxFAIL_MSG("unsupported blitting mode" );

         return FALSE ;
     }
         return FALSE ;
     }

-    
+

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

-       PixMapHandle    bmappixels =  GetGWorldPixMap( sourcePort ) ; 
+       PixMapHandle    bmappixels =  GetGWorldPixMap( sourcePort ) ;

        if ( LockPixels(bmappixels) )
        {
         wxMacPortSetter helper(this) ;
        if ( LockPixels(bmappixels) )
        {
         wxMacPortSetter helper(this) ;

-        RGBColor tempColor ;
-    
+

        if ( source->GetDepth() == 1 )
        {
            RGBForeColor( &MAC_WXCOLORREF(m_textForegroundColour.GetPixel()) ) ;
        if ( source->GetDepth() == 1 )
        {
            RGBForeColor( &MAC_WXCOLORREF(m_textForegroundColour.GetPixel()) ) ;


@@ -1172,8 +1222,8 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                    {
                        if ( LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) )
                        {
                    {
                        if ( LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) )
                        {

-                               CopyMask( GetPortBitMapForCopyBits( sourcePort ) , 
-                                           GetPortBitMapForCopyBits( MAC_WXHBITMAP(source->m_macMask) ) , 
+                               CopyMask( GetPortBitMapForCopyBits( sourcePort ) ,
+                                           GetPortBitMapForCopyBits( MAC_WXHBITMAP(source->m_macMask) ) ,

                                            GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
                                                &srcrect, &srcrect , &dstrect ) ;
                                UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) )  ) ;
                                            GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
                                                &srcrect, &srcrect , &dstrect ) ;
                                UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) )  ) ;


@@ -1218,12 +1268,12 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                                 {
                                     RGBColor srcColor ;
                                     RGBColor dstColor ;
                                 {
                                     RGBColor srcColor ;
                                     RGBColor dstColor ;

-                                    
+

                                     SetPort( (GrafPtr) sourcePort ) ;
                                     GetCPixel(  srcPoint.h , srcPoint.v , &srcColor) ;
                                     SetPort( (GrafPtr) m_macPort ) ;
                                     GetCPixel( dstPoint.h , dstPoint.v , &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 ) ;
                                 }
                                     wxMacCalculateColour( logical_func , srcColor ,  dstColor ) ;
                                     SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
                                 }


@@ -1237,7 +1287,7 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                     {
                         MacInvertRgn( clipRgn ) ;
                     }
                     {
                         MacInvertRgn( clipRgn ) ;
                     }

-                               CopyBits( GetPortBitMapForCopyBits( sourcePort ) , 
+                               CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,

                                    GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
                                        &srcrect, &dstrect, mode, clipRgn ) ;
                    }
                                    GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
                                        &srcrect, &dstrect, mode, clipRgn ) ;
                    }


@@ -1280,12 +1330,12 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                             {
                                 RGBColor srcColor ;
                                 RGBColor dstColor ;
                             {
                                 RGBColor srcColor ;
                                 RGBColor dstColor ;

-                                
+

                                 SetPort( (GrafPtr) sourcePort ) ;
                                 GetCPixel(  srcPoint.h , srcPoint.v , &srcColor) ;
                                 SetPort( (GrafPtr) m_macPort ) ;
                                 GetCPixel( dstPoint.h , dstPoint.v , &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 ) ;
                             }
                                 wxMacCalculateColour( logical_func , srcColor ,  dstColor ) ;
                                 SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
                             }


@@ -1300,120 +1350,111 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                 {
                     MacInvertRgn( clipRgn ) ;
                 }
                 {
                     MacInvertRgn( clipRgn ) ;
                 }

-                       CopyBits( GetPortBitMapForCopyBits( sourcePort ) , 
+                       CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,

                            GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
                                &srcrect, &dstrect, mode, NULL ) ;
                }
                DisposeRgn( clipRgn ) ;
                }
                UnlockPixels( bmappixels ) ;
                            GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
                                &srcrect, &dstrect, mode, NULL ) ;
                }
                DisposeRgn( clipRgn ) ;
                }
                UnlockPixels( bmappixels ) ;

-       } 
-       
+       }
+

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

-       
+

   return TRUE;
 }
 
   return TRUE;
 }
 

-void  wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+inline Fixed   IntToFixed( int inInt )
+       {
+               return (((SInt32) inInt) << 16);
+       }
+
+
+void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,

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

+    MacInstallFont() ;
+
+       wxString text ;
+       if ( wxApp::s_macDefaultEncodingIsPC )
+       {
+               text = wxMacMakeMacStringFromPC( str ) ;
+       }
+       else
+       {
+               text = str ;
+       }

 
 

-    // Calculate the size of the rotated bounding box.
-    double rad = DegToRad(angle);
-    double dx = cos(rad);
-    double dy = sin(rad);
-
-    // the rectngle vertices are counted clockwise with the first one being at
-    // (0, 0) (or, rather, at (x, y))
-    double x2 = w * dx;
-    double y2 = -w * dy;      // y axis points to the bottom, hence minus
-    double x4 = h * dy;
-    double y4 = h * dx;
-    double x3 = x4 + x2;
-    double y3 = y4 + y2;
-
-    // calc max and min
-    wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5);
-    wxCoord maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5);
-    wxCoord minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5);
-    wxCoord minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
- 
-    // prepare to blit-with-rotate the bitmap to the DC
-    wxImage image(src);
-
-    RGBColor colText = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() );
-    RGBColor colBack = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel() );
-
-    unsigned char *data = image.GetData();
-
-    wxCoord dstX, dstY;
-    double r, angleOrig;
-    bool textPixel;
-
-    // paint pixel by pixel
-    for ( wxCoord srcX = 0; srcX < w; srcX++ )
+       wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
+    if ( 0 )

     {
     {

-        for ( wxCoord srcY = 0; srcY < h; srcY++ )
-        {
-            // transform source coords to dest coords
-            r         = sqrt( (double)(srcX * srcX + srcY * srcY) );
-            angleOrig = atan2((double)srcY, (double)srcX) - rad;
-            dstX      = (wxCoord)(r * cos(angleOrig) + 0.5);
-            dstY      = (wxCoord)(r * sin(angleOrig) + 0.5);
-
-            // black pixel?
-            textPixel = data[(srcY*w + srcX)*3] == 0;
-            if ( textPixel || (m_backgroundMode == wxSOLID) )
-            {
-                SetCPixel(XLOG2DEVMAC(x + dstX), YLOG2DEVMAC(y + dstY),
-                          textPixel ? &colText : &colBack);
-            }
-        }
+        m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize);
+        SetAntiAliasedTextEnabled(true, m_scaleY * font->m_macFontSize);
+        m_macAliasWasEnabled = true ;

     }
 
     }
 

-    // it would be better to draw with non underlined font and draw the line
-    // manually here (it would be more straight...)
-#if 0
-    if ( m_font.GetUnderlined() )
+    OSStatus status = noErr ;
+
+       TECObjectRef ec;
+       status = TECCreateConverter(&ec, kTextEncodingMacRoman, kTextEncodingUnicodeDefault);
+       wxASSERT_MSG( status == noErr , "couldn't start converter" ) ;
+
+    ByteCount byteOutLen ;
+    ByteCount byteInLen = text.Length() ;
+    ByteCount byteBufferLen = byteInLen *2 ;
+    char* buf = new char[byteBufferLen] ;
+
+       status = TECConvertText(ec, (ConstTextPtr)text.c_str() , byteInLen, &byteInLen,
+           (TextPtr)buf, byteBufferLen, &byteOutLen);
+
+       wxASSERT_MSG( status == noErr , "couldn't convert text" ) ;
+       status = TECDisposeConverter(ec);
+       wxASSERT_MSG( status == noErr , "couldn't dispose converter" ) ;
+
+       ATSUTextLayout atsuLayout ;
+       UniCharCount chars = byteOutLen / 2 ;
+    status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) buf , 0 , byteOutLen / 2 , byteOutLen / 2 , 1 ,
+        &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
+       wxASSERT_MSG( status == noErr , "couldn't create the layout of the rotated text" );
+
+    if ( abs(angle) > 0 )

     {
     {

-        ::MoveTo(XLOG2DEVMAC(x + x4), YLOG2DEVMAC(y + y4 + font->descent));
-        ::LineTo(XLOG2DEVMAC(x + x3), YLOG2DEVMAC(y + y3 + font->descent));
+        Fixed atsuAngle = IntToFixed( angle ) ;
+       ByteCount angleSize = sizeof(Fixed) ;
+       ATSUAttributeTag rotationTag = kATSULineRotationTag ;
+       ATSUAttributeValuePtr   angleValue = &atsuAngle ;
+       status = ::ATSUSetLayoutControls(atsuLayout , 1 , &rotationTag , &angleSize , &angleValue ) ;

     }
     }

-#endif // 0

 
 

-    // update the bounding box
-    CalcBoundingBox(x + minX, y + minY);
-    CalcBoundingBox(x + maxX, y + maxY);
+    status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+                               IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) );
+       wxASSERT_MSG( status == noErr , "couldn't draw the rotated text" );
+    Rect rect ;
+       status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+                                       IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) , &rect );
+       wxASSERT_MSG( status == noErr , "couldn't measure the rotated text" );
+
+    OffsetRect( &rect , -m_macLocalOrigin.x , -m_macLocalOrigin.y ) ;
+    CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) );
+    CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) );
+    ::ATSUDisposeTextLayout(atsuLayout);
+    delete[] buf ;

 }
 }

+

 void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText  Invalid DC"));
 void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
 {
     wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText  Invalid DC"));


@@ -1421,71 +1462,115 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
 
        long xx = XLOG2DEVMAC(x);
        long yy = YLOG2DEVMAC(y);
 
        long xx = XLOG2DEVMAC(x);
        long yy = YLOG2DEVMAC(y);

-  
-//     if (m_pen.GetStyle() != wxTRANSPARENT)
+#if TARGET_CARBON
+       bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
+       useDrawThemeText = false ;
+#endif
+       MacInstallFont() ;
+    if ( 0 )
+    {
+        m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize);
+        SetAntiAliasedTextEnabled(true, 8);
+        m_macAliasWasEnabled = true ;
+    }
+
+       FontInfo fi ;
+       ::GetFontInfo( &fi ) ;
+
+#if TARGET_CARBON
+       if ( !useDrawThemeText )
+#endif
+           yy += fi.ascent ;
+
+       ::MoveTo( xx , yy );
+       if (  m_backgroundMode == wxTRANSPARENT )

        {
        {

-               MacInstallFont() ;
-               /*
-               Rect clip = { -32000 , -32000 , 32000 , 32000 } ;
-                       
-                 ::ClipRect( &clip ) ;
-               */
-               
-               FontInfo fi ;
-               ::GetFontInfo( &fi ) ;
-               
-               yy += fi.ascent ;
-               ::MoveTo( xx , yy );
-               if (  m_backgroundMode == wxTRANSPARENT )
-               {
-                       ::TextMode( srcOr) ;
-               }
-               else
-               {
-                       ::TextMode( srcCopy ) ;
-               }
+               ::TextMode( srcOr) ;
+       }
+       else
+       {
+               ::TextMode( srcCopy ) ;
+       }

 
 

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

 
 

-               if ( wxApp::s_macDefaultEncodingIsPC )
-               {
-                       macText = wxMacMakeMacStringFromPC( strtext ) ;
-                       text = macText ;
-                       length = macText.Length() ;
-               }
-               else
-               {
-                       text = strtext ;
-                       length = strtext.Length() ;
-               }
-               
-               int laststop = 0 ;
-               int i = 0 ;
-               int line = 0 ;
-               
-               while( i < length )
-               {
-                       if( text[i] == 13 || text[i] == 10)
-                       {
-                               ::DrawText( text , laststop , i - laststop ) ;
-                               line++ ;
-                               ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) );
-                               laststop = i+1 ;
-                       }
-                       i++ ;
-               }
-                               
-               ::DrawText( text , laststop , i - laststop ) ;
-               ::TextMode( srcOr ) ;
+       if ( wxApp::s_macDefaultEncodingIsPC )
+       {
+               macText = wxMacMakeMacStringFromPC( strtext ) ;
+               text = macText ;
+               length = macText.Length() ;
+       }
+       else
+       {
+               text = strtext ;
+               length = strtext.Length() ;
+       }
+
+       int laststop = 0 ;
+       int i = 0 ;
+       int line = 0 ;
+
+    {
+
+       while( i < length )
+       {
+               if( text[i] == 13 || text[i] == 10)
+               {
+#if TARGET_CARBON
+               if ( useDrawThemeText )
+               {
+                   Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading)  ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 1000 } ;
+                    CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+                       ::DrawThemeTextBox( mString,
+                                                               kThemeCurrentPortFont,
+                                                               kThemeStateActive,
+                                                               false,
+                                                               &frame,
+                                                               teJustLeft,
+                                                               nil );
+                   CFRelease( mString ) ;
+                   line++ ;
+                }
+                   else
+#endif
+                   {
+                               ::DrawText( text , laststop , i - laststop ) ;
+                   line++ ;
+                               ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) );
+                       }
+                       laststop = i+1 ;
+               }
+               i++ ;
+       }
+#if TARGET_CARBON
+        if ( useDrawThemeText )
+       {
+           Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading)  ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 1000 } ;
+            CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
+               ::DrawThemeTextBox( mString,
+                                                       kThemeCurrentPortFont,
+                                                       kThemeStateActive,
+                                                       false,
+                                                       &frame,
+                                                       teJustLeft,
+                                                       nil );
+            CFRelease( mString ) ;
+        }
+        else
+#endif
+        {
+           ::DrawText( text , laststop , i - laststop ) ;
+        }

        }
        }

+       ::TextMode( srcOr ) ;

 }
 
 }
 

-bool  wxDC::CanGetTextExtent() const 
+bool  wxDC::CanGetTextExtent() const

 {
        wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));
 {
        wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));

-               
+

        return true ;
 }
 
        return true ;
 }
 


@@ -1496,26 +1581,22 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
    wxCHECK_RET(Ok(), wxT("Invalid DC"));
    wxMacPortSetter helper(this) ;
 
    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 ) ;
+       useGetThemeText = false ;
+#endif

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


@@ -1523,7 +1604,7 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
                *descent =YDEV2LOGREL( fi.descent );
        if ( externalLeading )
                *externalLeading = YDEV2LOGREL( fi.leading ) ;
                *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 ;


@@ -1538,21 +1619,40 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
                text = string ;
                length = string.Length() ;
        }
                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 ;


@@ -1560,13 +1660,34 @@ 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 ( theFont )
        {
                if ( curwidth > *width )
                        *width = XDEV2LOGREL( curwidth ) ;
        }
 
        if ( theFont )
        {

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

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


@@ -1574,7 +1695,7 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
 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) ;
 
        MacInstallFont() ;
    wxMacPortSetter helper(this) ;
 
        MacInstallFont() ;


@@ -1587,7 +1708,7 @@ wxCoord   wxDC::GetCharWidth(void) const
 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) ;
 
        MacInstallFont() ;
     wxMacPortSetter helper(this) ;
 
        MacInstallFont() ;


@@ -1600,14 +1721,15 @@ wxCoord   wxDC::GetCharHeight(void) const
 
 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)

        {
        {

+           ::PenNormal() ;
+           //MacInstallBrush() ;

         MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ;
         MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ;

-       

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


@@ -1618,7 +1740,9 @@ void wxDC::MacInstallFont() const
 //     if ( m_macFontInstalled )
 //             return ;
        Pattern blackColor ;
 //     if ( m_macFontInstalled )
 //             return ;
        Pattern blackColor ;

-       
+
+       MacSetupBackgroundForCurrentPort(m_backgroundBrush) ;
+

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


@@ -1626,7 +1750,7 @@ void wxDC::MacInstallFont() const
                ::TextFont( font->m_macFontNum ) ;
                ::TextSize( short(m_scaleY * font->m_macFontSize) ) ;
                ::TextFace( font->m_macFontStyle ) ;
                ::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 ;


@@ -1638,15 +1762,19 @@ void wxDC::MacInstallFont() const
        }
        else
        {
        }
        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 ;


@@ -1660,7 +1788,7 @@ void wxDC::MacInstallFont() const
        short mode = patCopy ;
 
        // todo :
        short mode = patCopy ;
 
        // todo :

-       
+

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


@@ -1698,17 +1826,95 @@ void wxDC::MacInstallFont() const
                        break ;
        }
        ::PenMode( mode ) ;
                        break ;
        }
        ::PenMode( mode ) ;

+
+    OSStatus status = noErr ;
+
+    Fixed atsuSize = IntToFixed(m_scaleY * font->m_macFontSize) ;
+
+    Style qdStyle = font->m_macFontStyle ;
+       ATSUFontID      atsuFont = font->m_macATSUFontID ;
+
+    status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ;
+       wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ;
+
+       ATSUAttributeTag atsuTags[] =
+       {
+           kATSUFontTag ,
+           kATSUSizeTag ,
+//         kATSUColorTag ,
+           kATSUBaselineClassTag ,
+           kATSUVerticalCharacterTag,
+
+           kATSUQDBoldfaceTag ,
+           kATSUQDItalicTag ,
+           kATSUQDUnderlineTag ,
+           kATSUQDCondensedTag ,
+           kATSUQDExtendedTag ,
+
+       } ;
+
+    ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+    {
+        sizeof( ATSUFontID ) ,
+        sizeof( Fixed ) ,
+//        sizeof( RGBColor ) ,
+        sizeof( BslnBaselineClass ) ,
+        sizeof( ATSUVerticalCharacterType),
+
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+
+    } ;
+
+    Boolean kTrue = true ;
+    Boolean kFalse = false ;
+    BslnBaselineClass kBaselineDefault = kBSLNHangingBaseline ;
+
+    ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal;
+
+       ATSUAttributeValuePtr   atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+       {
+           &atsuFont ,
+           &atsuSize ,
+//         &MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) ,
+           &kBaselineDefault ,
+           &kHorizontal,
+
+           (qdStyle & bold) ? &kTrue : &kFalse ,
+           (qdStyle & italic) ? &kTrue : &kFalse ,
+           (qdStyle & underline) ? &kTrue : &kFalse ,
+           (qdStyle & condense) ? &kTrue : &kFalse ,
+           (qdStyle & extend) ? &kTrue : &kFalse ,
+       } ;
+
+       status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag),
+           atsuTags, atsuSizes, atsuValues);
+       wxASSERT_MSG( status == noErr , "couldn't set create ATSU style" ) ;
+

 }
 
 }
 

+Pattern gHatchPatterns[] =
+{
+    { 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF } ,
+    { 0x01 , 0x02 , 0x04 , 0x08 , 0x10 , 0x20 , 0x40 , 0x80 } ,
+    { 0x80 , 0x40 , 0x20 , 0x10 , 0x08 , 0x04 , 0x02 , 0x01 } ,
+    { 0x10 , 0x10 , 0x10 , 0xFF , 0x10 , 0x10 , 0x10 , 0x10 } ,
+    { 0x00 , 0x00 , 0x00 , 0xFF , 0x00 , 0x00 , 0x00 , 0x00 } ,
+    { 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 } ,
+    { 0x81 , 0x42 , 0x24 , 0x18 , 0x18 , 0x24 , 0x42 , 0x81 } ,
+} ;
+

 static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 {
 static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 {

-    // we have our own pattern list now
-       int thePatListID = 128;
-       int theIndex;
+       int theIndex = 1 ;
+

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

-                       theIndex = 2; 
+                       theIndex = 2;

                        break;
                case wxFDIAGONAL_HATCH:
                        theIndex = 3;
                        break;
                case wxFDIAGONAL_HATCH:
                        theIndex = 3;


@@ -1723,13 +1929,13 @@ static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
                        theIndex = 6;
                        break;
                case wxCROSSDIAG_HATCH:
                        theIndex = 6;
                        break;
                case wxCROSSDIAG_HATCH:

-                       theIndex = 7; 
+                       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
 }
 
 void wxDC::MacInstallPen() const


@@ -1745,17 +1951,17 @@ void wxDC::MacInstallPen() const
        RGBColor backcolor = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel());
        ::RGBForeColor( &forecolor );
        ::RGBBackColor( &backcolor );
        RGBColor backcolor = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel());
        ::RGBForeColor( &forecolor );
        ::RGBBackColor( &backcolor );

-       
+

        ::PenNormal() ;
        int penWidth = m_pen.GetWidth() * (int) m_scaleX ;
 
        // null means only one pixel, at whatever resolution
        if ( penWidth == 0 )
        ::PenNormal() ;
        int penWidth = m_pen.GetWidth() * (int) m_scaleX ;
 
        // null means only one pixel, at whatever resolution
        if ( penWidth == 0 )

-               penWidth = 1 ; 
+               penWidth = 1 ;

        ::PenSize(penWidth, penWidth);
 
        int penStyle = m_pen.GetStyle();
        ::PenSize(penWidth, penWidth);
 
        int penStyle = m_pen.GetStyle();

-       
+

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


@@ -1811,9 +2017,9 @@ void wxDC::MacInstallPen() const
        }
 
        short mode = patCopy ;
        }
 
        short mode = patCopy ;

-       
+

        // todo :
        // todo :

-       
+

        switch( m_logicalFunction )
        {
                case wxCOPY:       // only foreground color, leave background (thus not patCopy)
        switch( m_logicalFunction )
        {
                case wxCOPY:       // only foreground color, leave background (thus not patCopy)


@@ -1856,7 +2062,7 @@ void wxDC::MacInstallPen() const
        m_macFontInstalled = false ;
 }
 
        m_macFontInstalled = false ;
 }
 

-void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) 
+void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background )

 {
     Pattern whiteColor ;
     switch( background.MacGetBrushKind() )
 {
     Pattern whiteColor ;
     switch( background.MacGetBrushKind() )


@@ -1875,7 +2081,7 @@ void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background )
         }
       case kwxMacBrushColour :
         {
         }
       case kwxMacBrushColour :
         {

-                 ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) );
+                   ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) );

                int brushStyle = background.GetStyle();
                if (brushStyle == wxSOLID)
                        ::BackPat(GetQDGlobalsWhite(&whiteColor));
                int brushStyle = background.GetStyle();
                if (brushStyle == wxSOLID)
                        ::BackPat(GetQDGlobalsWhite(&whiteColor));


@@ -1903,7 +2109,7 @@ void wxDC::MacInstallBrush() const
 //             return ;
 
        // foreground
 //             return ;
 
        // foreground

-       
+

        bool backgroundTransparent = (GetBackgroundMode() == wxTRANSPARENT) ;
 
        ::RGBForeColor( &MAC_WXCOLORREF( m_brush.GetColour().GetPixel()) );
        bool backgroundTransparent = (GetBackgroundMode() == wxTRANSPARENT) ;
 
        ::RGBForeColor( &MAC_WXCOLORREF( m_brush.GetColour().GetPixel()) );


@@ -1932,9 +2138,9 @@ void wxDC::MacInstallBrush() const
 
            if ( m_brush.GetStyle() == wxSTIPPLE )
                gw = MAC_WXHBITMAP(bitmap->GetHBITMAP())  ;
 
            if ( m_brush.GetStyle() == wxSTIPPLE )
                gw = MAC_WXHBITMAP(bitmap->GetHBITMAP())  ;

-           else 
+           else

                gw = MAC_WXHBITMAP(bitmap->GetMask()->GetMaskBitmap()) ;
                gw = MAC_WXHBITMAP(bitmap->GetMask()->GetMaskBitmap()) ;

-               
+

         PixMapHandle gwpixmaphandle = GetGWorldPixMap( gw ) ;
         LockPixels( gwpixmaphandle ) ;
 
         PixMapHandle gwpixmaphandle = GetGWorldPixMap( gw ) ;
         LockPixels( gwpixmaphandle ) ;
 


@@ -1946,42 +2152,38 @@ void wxDC::MacInstallBrush() const
                 isMonochrome = true ;
         }
 
                 isMonochrome = true ;
         }
 

-
-           if ( isMonochrome )
+        if ( isMonochrome && width == 8 && height == 8 )

            {
                ::RGBForeColor( &MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) );
                ::RGBForeColor( &MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) );
            {
                ::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 ;
             BitMap* gwbitmap = (BitMap*) *gwpixmaphandle ; // since the color depth is 1 it is a BitMap
             UInt8 *gwbits = (UInt8*) gwbitmap->baseAddr ;
             int alignment = gwbitmap->rowBytes & 0x7FFF ;

-
-           if( width == 8 && height == 8 )
-           {
-                Pattern pat ;
-                for ( int i = 0 ; i < 8 ; ++i )
-                {
-                    pat.pat[i] = gwbits[i*alignment+0] ;
-                }
-                UnlockPixels( GetGWorldPixMap( gw ) ) ;
-                ::PenPat( &pat ) ;
-           }
-           else
-           {
- #if wxMAC_EXPERIMENTAL_PATTERN
+            Pattern pat ;
+            for ( int i = 0 ; i < 8 ; ++i )
+            {
+                pat.pat[i] = gwbits[i*alignment+0] ;
+            }
+            UnlockPixels( GetGWorldPixMap( gw ) ) ;
+            ::PenPat( &pat ) ;
+           }
+           else
+           {

  // this will be the code to handle power of 2 patterns, we will have to arrive at a nice
  // caching scheme before putting this into production
  // this will be the code to handle power of 2 patterns, we will have to arrive at a nice
  // caching scheme before putting this into production

-               Handle      image;
-               long            imageSize;
-               PixPatHandle pixpat = NewPixPat() ;
-
-                       CopyPixMap(gwpixmaphandle, (**pixpat).patMap);
-                   imageSize = GetPixRowBytes((**pixpat).patMap) *
-                                   ((**(**pixpat).patMap).bounds.bottom -
-                                   (**(**pixpat).patMap).bounds.top);
-                               
-                   PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize );
-                   (**pixpat).patData = image;
+               Handle      image;
+               long            imageSize;
+               PixPatHandle pixpat = NewPixPat() ;
+
+               CopyPixMap(gwpixmaphandle, (**pixpat).patMap);
+            imageSize = GetPixRowBytes((**pixpat).patMap) *
+                           ((**(**pixpat).patMap).bounds.bottom -
+                           (**(**pixpat).patMap).bounds.top);
+
+            PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize );
+            (**pixpat).patData = image;
+            if ( isMonochrome )
+            {

                    CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ;
                    ColorSpecPtr ctspec = (ColorSpecPtr) &(**ctable).ctTable ;
                    if ( ctspec[0].rgb.red == 0x0000 )
                    CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ;
                    ColorSpecPtr ctspec = (ColorSpecPtr) &(**ctable).ctTable ;
                    if ( ctspec[0].rgb.red == 0x0000 )


@@ -1995,12 +2197,9 @@ void wxDC::MacInstallBrush() const
                        ctspec[1].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ;
                    }
                    ::CTabChanged( ctable ) ;
                        ctspec[1].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ;
                    }
                    ::CTabChanged( ctable ) ;

-                   ::PenPixPat(pixpat);
-#endif
-           }
-           }
-           else
-           {
+            }
+            ::PenPixPat(pixpat);
+            m_macForegroundPixMap = pixpat ;

            }
            UnlockPixels( gwpixmaphandle ) ;
        }
            }
            UnlockPixels( gwpixmaphandle ) ;
        }


@@ -2008,7 +2207,7 @@ void wxDC::MacInstallBrush() const
     {
            ::PenPat(GetQDGlobalsBlack(&blackColor));
        }
     {
            ::PenPat(GetQDGlobalsBlack(&blackColor));
        }

-               
+

        short mode = patCopy ;
        switch( m_logicalFunction )
        {
        short mode = patCopy ;
        switch( m_logicalFunction )
        {