Include wx/statusbr.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp
index 0f878d291107ce001ac9752518419372982ef393..fb97b10859065a19ff320a384606eaf4fc9ba355 100755 (executable)
--- a/src/mac/carbon/dccg.cpp
+++ b/src/mac/carbon/dccg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.cpp
+// Name:        src/mac/carbon/dccg.cpp

 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -15,20 +15,23 @@
 
 #if wxMAC_USE_CORE_GRAPHICS
 
 
 #if wxMAC_USE_CORE_GRAPHICS
 

-#include "wx/app.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/dcmemory.h"
+    #include "wx/dcprint.h"
+#endif
+

 #include "wx/mac/uma.h"
 #include "wx/mac/uma.h"

-#include "wx/dcmemory.h"
-#include "wx/dcprint.h"

 #include "wx/region.h"
 #include "wx/image.h"
 #include "wx/region.h"
 #include "wx/image.h"

-#include "wx/log.h"

 
 
 #ifdef __MSL__
     #if __MSL__ >= 0x6000
         #include "math.h"
         // in case our functions were defined outside std, we make it known all the same
 
 
 #ifdef __MSL__
     #if __MSL__ >= 0x6000
         #include "math.h"
         // in case our functions were defined outside std, we make it known all the same

-        namespace std { }  
+        namespace std { }

         using namespace std ;
     #endif
 #endif
         using namespace std ;
     #endif
 #endif


@@ -37,6 +40,10 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 

+#ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES
+#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0
+#endif
+

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


@@ -46,19 +53,21 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 const double M_PI = 3.14159265358979 ;
 #endif
 #endif
 const double M_PI = 3.14159265358979 ;
 #endif
 #endif

-const double RAD2DEG  = 180.0 / M_PI;
+
+const double RAD2DEG = 180.0 / M_PI;

 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;
 
 extern TECObjectRef s_TECNativeCToUnicode ;
 
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;
 
 extern TECObjectRef s_TECNativeCToUnicode ;
 

-// TODO Update
-// The text ctrl implementation still needs that for the non hiview implementation

 
 

+// TODO: update
+// The textctrl implementation still needs that (needs what?) for the non-HIView implementation
+//

 wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
 wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :

-    wxMacPortSaver( (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) )
+    wxMacPortSaver( (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) )

 {
 {

-    m_newPort = (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ;
+    m_newPort = (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) ;

     m_formerClip = NewRgn() ;
     m_newClip = NewRgn() ;
     GetClip( m_formerClip ) ;
     m_formerClip = NewRgn() ;
     m_newClip = NewRgn() ;
     GetClip( m_formerClip ) ;


@@ -69,7 +78,8 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
         if ( win->GetPeer() )
         {
             int x = 0 , y = 0;
         if ( win->GetPeer() )
         {
             int x = 0 , y = 0;

-            win->MacWindowToRootWindow( &x,&y ) ;
+            win->MacWindowToRootWindow( &x, &y ) ;
+

             // get area including focus rect
             CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ) ;
             if ( !EmptyRgn( m_newClip ) )
             // get area including focus rect
             CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ) ;
             if ( !EmptyRgn( m_newClip ) )


@@ -80,7 +90,7 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
     }
 }
 
     }
 }
 

-wxMacWindowClipper::~wxMacWindowClipper() 
+wxMacWindowClipper::~wxMacWindowClipper()

 {
     SetPort( m_newPort ) ;
     SetClip( m_formerClip ) ;
 {
     SetPort( m_newPort ) ;
     SetClip( m_formerClip ) ;


@@ -92,11 +102,11 @@ wxMacWindowStateSaver::wxMacWindowStateSaver( const wxWindow* win ) :
     wxMacWindowClipper( win )
 {
     // the port is already set at this point
     wxMacWindowClipper( win )
 {
     // the port is already set at this point

-    m_newPort = (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ;
+    m_newPort = (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) ;

     GetThemeDrawingState( &m_themeDrawingState ) ;
 }
 
     GetThemeDrawingState( &m_themeDrawingState ) ;
 }
 

-wxMacWindowStateSaver::~wxMacWindowStateSaver() 
+wxMacWindowStateSaver::~wxMacWindowStateSaver()

 {
     SetPort( m_newPort ) ;
     SetThemeDrawingState( m_themeDrawingState , true ) ;
 {
     SetPort( m_newPort ) ;
     SetThemeDrawingState( m_themeDrawingState , true ) ;


@@ -109,6 +119,7 @@ wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
 {
     wxASSERT( dc->Ok() ) ;
     m_dc = dc ;
 {
     wxASSERT( dc->Ok() ) ;
     m_dc = dc ;

+

 //    dc->MacSetupPort(&m_ph) ;
 }
 
 //    dc->MacSetupPort(&m_ph) ;
 }
 


@@ -147,13 +158,13 @@ wxMacCGPath::~wxMacCGPath()
     CGPathRelease( m_path ) ;
 }
 
     CGPathRelease( m_path ) ;
 }
 

-//  Starts a new subpath at
+// opens (starts) a new subpath

 void wxMacCGPath::MoveToPoint( wxCoord x1 , wxCoord y1 )
 {
     CGPathMoveToPoint( m_path , NULL , x1 , y1 ) ;
 }
 
 void wxMacCGPath::MoveToPoint( wxCoord x1 , wxCoord y1 )
 {
     CGPathMoveToPoint( m_path , NULL , x1 , y1 ) ;
 }
 

-void wxMacCGPath::AddLineToPoint( wxCoord x1 , wxCoord y1 ) 
+void wxMacCGPath::AddLineToPoint( wxCoord x1 , wxCoord y1 )

 {
     CGPathAddLineToPoint( m_path , NULL , x1 , y1 ) ;
 }
 {
     CGPathAddLineToPoint( m_path , NULL , x1 , y1 ) ;
 }


@@ -180,12 +191,12 @@ void wxMacCGPath::CloseSubpath()
     CGPathCloseSubpath( m_path ) ;
 }
 
     CGPathCloseSubpath( m_path ) ;
 }
 

-CGPathRef wxMacCGPath::GetPath() const 
+CGPathRef wxMacCGPath::GetPath() const

 {
     return m_path ;
 }
 
 {
     return m_path ;
 }
 

-wxMacCGContext::wxMacCGContext( CGrafPtr port ) 
+wxMacCGContext::wxMacCGContext( CGrafPtr port )

 {
     m_qdPort = port ;
     m_cgContext = NULL ;
 {
     m_qdPort = port ;
     m_cgContext = NULL ;


@@ -205,7 +216,7 @@ wxMacCGContext::wxMacCGContext()
     m_cgContext = NULL ;
 }
 
     m_cgContext = NULL ;
 }
 

-wxMacCGContext::~wxMacCGContext() 
+wxMacCGContext::~wxMacCGContext()

 {
     if ( m_cgContext )
     {
 {
     if ( m_cgContext )
     {


@@ -224,14 +235,14 @@ void wxMacCGContext::Clip( const wxRegion &region )
 //    ClipCGContextToRegion ( m_cgContext, &bounds , (RgnHandle) dc->m_macCurrentClipRgn ) ;
 }
 
 //    ClipCGContextToRegion ( m_cgContext, &bounds , (RgnHandle) dc->m_macCurrentClipRgn ) ;
 }
 

-void wxMacCGContext::StrokePath( const wxGraphicPath *p ) 
+void wxMacCGContext::StrokePath( const wxGraphicPath *p )

 {
     const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ;
     CGContextAddPath( m_cgContext , path->GetPath() ) ;
     CGContextStrokePath( m_cgContext ) ;
 }
 
 {
     const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ;
     CGContextAddPath( m_cgContext , path->GetPath() ) ;
     CGContextStrokePath( m_cgContext ) ;
 }
 

-void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) 
+void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle )

 {
     const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ;
     CGPathDrawingMode mode = m_mode ;
 {
     const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ;
     CGPathDrawingMode mode = m_mode ;


@@ -248,40 +259,40 @@ void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle )
     CGContextDrawPath( m_cgContext , mode ) ;
 }
 
     CGContextDrawPath( m_cgContext , mode ) ;
 }
 

-void wxMacCGContext::FillPath( const wxGraphicPath *p , const wxColor &fillColor , int fillStyle ) 
+void wxMacCGContext::FillPath( const wxGraphicPath *p , const wxColor &fillColor , int fillStyle )

 {
     const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ;
     CGContextSaveGState( m_cgContext ) ;
 {
     const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ;
     CGContextSaveGState( m_cgContext ) ;

-    
+

     RGBColor col = MAC_WXCOLORREF( fillColor.GetPixel() ) ;
     CGContextSetRGBFillColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ;
     CGPathDrawingMode mode = kCGPathFill ;
 
     if ( fillStyle == wxODDEVEN_RULE )
         mode = kCGPathEOFill ;
     RGBColor col = MAC_WXCOLORREF( fillColor.GetPixel() ) ;
     CGContextSetRGBFillColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ;
     CGPathDrawingMode mode = kCGPathFill ;
 
     if ( fillStyle == wxODDEVEN_RULE )
         mode = kCGPathEOFill ;

-               
+

     CGContextBeginPath( m_cgContext ) ;
     CGContextAddPath( m_cgContext , path->GetPath() ) ;
     CGContextClosePath( m_cgContext ) ;
     CGContextDrawPath( m_cgContext , mode ) ;
     CGContextBeginPath( m_cgContext ) ;
     CGContextAddPath( m_cgContext , path->GetPath() ) ;
     CGContextClosePath( m_cgContext ) ;
     CGContextDrawPath( m_cgContext , mode ) ;

-    
+

     CGContextRestoreGState( m_cgContext ) ;
 }
     CGContextRestoreGState( m_cgContext ) ;
 }

-    
-wxGraphicPath* wxMacCGContext::CreatePath() 
-{ 
+
+wxGraphicPath* wxMacCGContext::CreatePath()
+{

     // make sure that we now have a real cgref, before doing
     // anything with paths
     CGContextRef cg = GetNativeContext() ;
     cg = NULL ;
 
     // make sure that we now have a real cgref, before doing
     // anything with paths
     CGContextRef cg = GetNativeContext() ;
     cg = NULL ;
 

-    return new wxMacCGPath() ; 
+    return new wxMacCGPath() ;

 }
 
 // in case we only got a QDPort only create a cgref now
 
 }
 
 // in case we only got a QDPort only create a cgref now
 

-CGContextRef wxMacCGContext::GetNativeContext() 
-{ 
+CGContextRef wxMacCGContext::GetNativeContext()
+{

     if ( m_cgContext == NULL )
     {
         Rect bounds ;
     if ( m_cgContext == NULL )
     {
         Rect bounds ;


@@ -293,28 +304,29 @@ CGContextRef wxMacCGContext::GetNativeContext()
 
         CGContextTranslateCTM( m_cgContext , 0 , bounds.bottom - bounds.top ) ;
         CGContextScaleCTM( m_cgContext , 1 , -1 ) ;
 
         CGContextTranslateCTM( m_cgContext , 0 , bounds.bottom - bounds.top ) ;
         CGContextScaleCTM( m_cgContext , 1 , -1 ) ;

-        
+

         CGContextSaveGState( m_cgContext ) ;
         SetPen( m_pen ) ;
         SetBrush( m_brush ) ;
     }
 
         CGContextSaveGState( m_cgContext ) ;
         SetPen( m_pen ) ;
         SetBrush( m_brush ) ;
     }
 

-    return m_cgContext ; 
+    return m_cgContext ;

 }
 
 }
 

-void wxMacCGContext::SetNativeContext( CGContextRef cg ) 
-{ 
+void wxMacCGContext::SetNativeContext( CGContextRef cg )
+{

     // we allow either setting or clearing but not replacing
     wxASSERT( m_cgContext == NULL || cg == NULL ) ;
 
     if ( cg )
         CGContextSaveGState( cg ) ;
     // we allow either setting or clearing but not replacing
     wxASSERT( m_cgContext == NULL || cg == NULL ) ;
 
     if ( cg )
         CGContextSaveGState( cg ) ;

-    m_cgContext = cg ; 
+    m_cgContext = cg ;

 }
 
 #pragma mark -
 }
 
 #pragma mark -

+#pragma mark wxMacCGPattern, ImagePattern, HatchPattern classes

 
 

-// wrapper class for a CGPattern, always allocate on heap, never call destructor
+// CGPattern wrapper class: always allocate on heap, never call destructor

 
 class wxMacCGPattern
 {
 
 class wxMacCGPattern
 {


@@ -329,7 +341,7 @@ public :
 protected :
     virtual ~wxMacCGPattern()
     {
 protected :
     virtual ~wxMacCGPattern()
     {

-        // as this is called only when our m_patternRef is been released;
+        // as this is called only when the m_patternRef is been released;

         // don't release it again
     }
 
         // don't release it again
     }
 


@@ -362,7 +374,7 @@ public :
 
         Init( (CGImageRef) bmp->CGImageCreate() , transform ) ;
     }
 
         Init( (CGImageRef) bmp->CGImageCreate() , transform ) ;
     }

-    
+

     // ImagePattern takes ownership of CGImageRef passed in
     ImagePattern( CGImageRef image , CGAffineTransform transform )
     {
     // ImagePattern takes ownership of CGImageRef passed in
     ImagePattern( CGImageRef image , CGAffineTransform transform )
     {


@@ -371,7 +383,7 @@ public :
 
         Init( image , transform ) ;
     }
 
         Init( image , transform ) ;
     }

-    
+

     virtual void Render( CGContextRef ctxRef )
     {
         if (m_image != NULL)
     virtual void Render( CGContextRef ctxRef )
     {
         if (m_image != NULL)


@@ -379,15 +391,16 @@ public :
     }
 
 protected :
     }
 
 protected :

-    void Init( CGImageRef image , CGAffineTransform transform )
+    void Init( CGImageRef image, CGAffineTransform transform )

     {
         m_image = image ;
         if ( m_image )
         {
     {
         m_image = image ;
         if ( m_image )
         {

-            m_imageBounds = CGRectMake( 0.0, 0.0, (float)CGImageGetWidth( m_image  ), (float)CGImageGetHeight( m_image ) ) ;
-            m_patternRef = CGPatternCreate( this , m_imageBounds, transform ,
-                                            m_imageBounds.size.width, m_imageBounds.size.height,
-                                            kCGPatternTilingNoDistortion, true , &wxMacCGPattern::ms_Callbacks ) ;
+            m_imageBounds = CGRectMake( 0.0, 0.0, (float)CGImageGetWidth( m_image ), (float)CGImageGetHeight( m_image ) ) ;
+            m_patternRef = CGPatternCreate(
+                this , m_imageBounds, transform ,
+                m_imageBounds.size.width, m_imageBounds.size.height,
+                kCGPatternTilingNoDistortion, true , &wxMacCGPattern::ms_Callbacks ) ;

         }
     }
 
         }
     }
 


@@ -397,22 +410,23 @@ protected :
             CGImageRelease( m_image ) ;
     }
 
             CGImageRelease( m_image ) ;
     }
 

-    CGImageRef  m_image ;
-    CGRect      m_imageBounds ;
+    CGImageRef m_image ;
+    CGRect m_imageBounds ;

 } ;
 
 class HatchPattern : public wxMacCGPattern
 {
 public :
 } ;
 
 class HatchPattern : public wxMacCGPattern
 {
 public :

-    HatchPattern( int hatchstyle  , CGAffineTransform transform )
+    HatchPattern( int hatchstyle, CGAffineTransform transform )

     {
         m_hatch = hatchstyle ;
         m_imageBounds = CGRectMake( 0.0, 0.0, 8.0 , 8.0 ) ;
     {
         m_hatch = hatchstyle ;
         m_imageBounds = CGRectMake( 0.0, 0.0, 8.0 , 8.0 ) ;

-        m_patternRef = CGPatternCreate( this , m_imageBounds, transform ,
-                                            m_imageBounds.size.width, m_imageBounds.size.height,
-                                            kCGPatternTilingNoDistortion, false , &wxMacCGPattern::ms_Callbacks ) ;
+        m_patternRef = CGPatternCreate(
+            this , m_imageBounds, transform ,
+            m_imageBounds.size.width, m_imageBounds.size.height,
+            kCGPatternTilingNoDistortion, false , &wxMacCGPattern::ms_Callbacks ) ;

     }
     }

-        
+

     void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count )
     {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
     void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count )
     {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4


@@ -423,7 +437,7 @@ public :
         else
 #endif
         {
         else
 #endif
         {

-            CGContextBeginPath (ctxRef);
+            CGContextBeginPath( ctxRef );

             for (size_t i = 0; i < count; i += 2)
             {
                 CGContextMoveToPoint(ctxRef, pts[i].x, pts[i].y);
             for (size_t i = 0; i < count; i += 2)
             {
                 CGContextMoveToPoint(ctxRef, pts[i].x, pts[i].y);


@@ -432,7 +446,7 @@ public :
             CGContextStrokePath(ctxRef);
         }
     }
             CGContextStrokePath(ctxRef);
         }
     }

-    
+

     virtual void Render( CGContextRef ctxRef )
     {
         switch ( m_hatch )
     virtual void Render( CGContextRef ctxRef )
     {
         switch ( m_hatch )


@@ -441,7 +455,7 @@ public :
                 {
                     CGPoint pts[] =
                     {
                 {
                     CGPoint pts[] =
                     {

-                    { 8.0 , 0.0 } , { 0.0 , 8.0 } 
+                    { 8.0 , 0.0 } , { 0.0 , 8.0 }

                     };
                     StrokeLineSegments( ctxRef , pts , 2 ) ;
                 }
                     };
                     StrokeLineSegments( ctxRef , pts , 2 ) ;
                 }


@@ -451,8 +465,8 @@ public :
                 {
                     CGPoint pts[] =
                     {
                 {
                     CGPoint pts[] =
                     {

-                        { 0.0 , 0.0 } , { 8.0 , 8.0 } , 
-                        { 8.0 , 0.0 } , { 0.0 , 8.0 } 
+                        { 0.0 , 0.0 } , { 8.0 , 8.0 } ,
+                        { 8.0 , 0.0 } , { 0.0 , 8.0 }

                     };
                     StrokeLineSegments( ctxRef , pts , 4 ) ;
                 }
                     };
                     StrokeLineSegments( ctxRef , pts , 4 ) ;
                 }


@@ -462,7 +476,7 @@ public :
                 {
                     CGPoint pts[] =
                     {
                 {
                     CGPoint pts[] =
                     {

-                    { 0.0 , 0.0 } , { 8.0 , 8.0 } 
+                    { 0.0 , 0.0 } , { 8.0 , 8.0 }

                     };
                     StrokeLineSegments( ctxRef , pts , 2 ) ;
                 }
                     };
                     StrokeLineSegments( ctxRef , pts , 2 ) ;
                 }


@@ -472,8 +486,8 @@ public :
                 {
                     CGPoint pts[] =
                     {
                 {
                     CGPoint pts[] =
                     {

-                    { 0.0 , 4.0 } , { 8.0 , 4.0 } , 
-                    { 4.0 , 0.0 } , { 4.0 , 8.0 } , 
+                    { 0.0 , 4.0 } , { 8.0 , 4.0 } ,
+                    { 4.0 , 0.0 } , { 4.0 , 8.0 } ,

                     };
                     StrokeLineSegments( ctxRef , pts , 4 ) ;
                 }
                     };
                     StrokeLineSegments( ctxRef , pts , 4 ) ;
                 }


@@ -483,7 +497,7 @@ public :
                 {
                     CGPoint pts[] =
                     {
                 {
                     CGPoint pts[] =
                     {

-                    { 0.0 , 4.0 } , { 8.0 , 4.0 } , 
+                    { 0.0 , 4.0 } , { 8.0 , 4.0 } ,

                     };
                     StrokeLineSegments( ctxRef , pts , 2 ) ;
                 }
                     };
                     StrokeLineSegments( ctxRef , pts , 2 ) ;
                 }


@@ -493,7 +507,7 @@ public :
                 {
                     CGPoint pts[] =
                     {
                 {
                     CGPoint pts[] =
                     {

-                    { 4.0 , 0.0 } , { 4.0 , 8.0 } , 
+                    { 4.0 , 0.0 } , { 4.0 , 8.0 } ,

                     };
                     StrokeLineSegments( ctxRef , pts , 2 ) ;
                 }
                     };
                     StrokeLineSegments( ctxRef , pts , 2 ) ;
                 }


@@ -503,13 +517,15 @@ public :
                 break;
         }
     }
                 break;
         }
     }

-    
+

 protected :
     ~HatchPattern() {}
 
 protected :
     ~HatchPattern() {}
 

-    int         m_hatch ;

     CGRect      m_imageBounds ;
     CGRect      m_imageBounds ;

-} ;
+    int         m_hatch ;
+};
+
+#pragma mark -

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


@@ -519,9 +535,9 @@ void wxMacCGContext::SetPen( const wxPen &pen )
 
     bool fill = m_brush.GetStyle() != wxTRANSPARENT ;
     bool stroke = pen.GetStyle() != wxTRANSPARENT ;
 
     bool fill = m_brush.GetStyle() != wxTRANSPARENT ;
     bool stroke = pen.GetStyle() != wxTRANSPARENT ;

-    
+

 #if 0
 #if 0

-    // we can benchmark performance, should go into a setting later
+    // we can benchmark performance; should go into a setting eventually

     CGContextSetShouldAntialias( m_cgContext , false ) ;
 #endif
 
     CGContextSetShouldAntialias( m_cgContext , false ) ;
 #endif
 


@@ -535,12 +551,12 @@ void wxMacCGContext::SetPen( const wxPen &pen )
             RGBColor col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ) ;
             CGContextSetRGBStrokeColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ;
 
             RGBColor col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ) ;
             CGContextSetRGBStrokeColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ;
 

-            // TODO * m_dc->m_scaleX
+            // TODO: * m_dc->m_scaleX

             float penWidth = pen.GetWidth();
             if (penWidth <= 0.0)
                 penWidth = 0.1;
             CGContextSetLineWidth( m_cgContext , penWidth ) ;
             float penWidth = pen.GetWidth();
             if (penWidth <= 0.0)
                 penWidth = 0.1;
             CGContextSetLineWidth( m_cgContext , penWidth ) ;

-            
+

             CGLineCap cap ;
             switch ( pen.GetCap() )
             {
             CGLineCap cap ;
             switch ( pen.GetCap() )
             {


@@ -578,18 +594,18 @@ void wxMacCGContext::SetPen( const wxPen &pen )
 
                 default :
                     join = kCGLineJoinMiter ;
 
                 default :
                     join = kCGLineJoinMiter ;

-                    break; 
+                    break;

             }
 
             m_mode = kCGPathStroke ;
             int count = 0 ;
             }
 
             m_mode = kCGPathStroke ;
             int count = 0 ;

-            
+

             const float *lengths = NULL ;
             float *userLengths = NULL ;
 
             const float dashUnit = penWidth < 1.0 ? 1.0 : penWidth;
             const float *lengths = NULL ;
             float *userLengths = NULL ;
 
             const float dashUnit = penWidth < 1.0 ? 1.0 : penWidth;

-  
-            const float dotted[] = { dashUnit  , dashUnit + 2.0 };
+
+            const float dotted[] = { dashUnit , dashUnit + 2.0 };

             const float short_dashed[] = { 9.0 , 6.0 };
             const float dashed[] = { 19.0 , 9.0 };
             const float dotted_dashed[] = { 9.0 , 6.0 , 3.0 , 3.0 };
             const float short_dashed[] = { 9.0 , 6.0 };
             const float dashed[] = { 19.0 , 9.0 };
             const float dotted_dashed[] = { 9.0 , 6.0 , 3.0 , 3.0 };


@@ -625,7 +641,7 @@ void wxMacCGContext::SetPen( const wxPen &pen )
                     if ((dashes != NULL) && (count > 0))
                     {
                         userLengths = new float[count] ;
                     if ((dashes != NULL) && (count > 0))
                     {
                         userLengths = new float[count] ;

-                        for( int i = 0 ; i < count ; ++i )
+                        for ( int i = 0 ; i < count ; ++i )

                         {
                             userLengths[i] = dashes[i] * dashUnit ;
 
                         {
                             userLengths[i] = dashes[i] * dashUnit ;
 


@@ -642,7 +658,7 @@ void wxMacCGContext::SetPen( const wxPen &pen )
                     {
                         float  alphaArray[1] = { 1.0 } ;
                         wxBitmap* bmp = pen.GetStipple() ;
                     {
                         float  alphaArray[1] = { 1.0 } ;
                         wxBitmap* bmp = pen.GetStipple() ;

-                        if ( bmp && bmp->Ok() ) 
+                        if ( bmp && bmp->Ok() )

                         {
                             wxMacCFRefHolder<CGColorSpaceRef> patternSpace( CGColorSpaceCreatePattern( NULL ) ) ;
                             CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ;
                         {
                             wxMacCFRefHolder<CGColorSpaceRef> patternSpace( CGColorSpaceCreatePattern( NULL ) ) ;
                             CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ;


@@ -657,13 +673,13 @@ void wxMacCGContext::SetPen( const wxPen &pen )
                         wxMacCFRefHolder<CGColorSpaceRef> patternSpace( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ) ;
                         CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ;
                         wxMacCFRefHolder<CGPatternRef> pattern( *( new HatchPattern( pen.GetStyle() , CGContextGetCTM( m_cgContext ) ) ) );
                         wxMacCFRefHolder<CGColorSpaceRef> patternSpace( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ) ;
                         CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ;
                         wxMacCFRefHolder<CGPatternRef> pattern( *( new HatchPattern( pen.GetStyle() , CGContextGetCTM( m_cgContext ) ) ) );

-                        
+

                         RGBColor col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ) ;
                         float  colorArray[4] = { col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 } ;
                         RGBColor col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ) ;
                         float  colorArray[4] = { col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 } ;

-                        
+

                         CGContextSetStrokePattern( m_cgContext, pattern , colorArray ) ;
                     }
                         CGContextSetStrokePattern( m_cgContext, pattern , colorArray ) ;
                     }

-                    break ; 
+                    break ;

             }
 
             if ((lengths != NULL) && (count > 0))
             }
 
             if ((lengths != NULL) && (count > 0))


@@ -672,7 +688,7 @@ void wxMacCGContext::SetPen( const wxPen &pen )
                 // force the line cap, otherwise we get artifacts (overlaps) and just solid lines
                 cap = kCGLineCapButt ;
             }
                 // force the line cap, otherwise we get artifacts (overlaps) and just solid lines
                 cap = kCGLineCapButt ;
             }

-            else 
+            else

             {
                CGContextSetLineDash( m_cgContext , 0 , NULL , 0 ) ;
             }
             {
                CGContextSetLineDash( m_cgContext , 0 , NULL , 0 ) ;
             }


@@ -722,7 +738,7 @@ void wxMacCGContext::SetBrush( const wxBrush &brush )
 
                 RGBColor col = MAC_WXCOLORREF( brush.GetColour().GetPixel() ) ;
                 float  colorArray[4] = { col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 } ;
 
                 RGBColor col = MAC_WXCOLORREF( brush.GetColour().GetPixel() ) ;
                 float  colorArray[4] = { col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 } ;

-                
+

                 CGContextSetFillPattern( m_cgContext, pattern , colorArray ) ;
             }
             else
                 CGContextSetFillPattern( m_cgContext, pattern , colorArray ) ;
             }
             else


@@ -730,7 +746,7 @@ void wxMacCGContext::SetBrush( const wxBrush &brush )
                 // now brush is a bitmap
                 float  alphaArray[1] = { 1.0 } ;
                 wxBitmap* bmp = brush.GetStipple() ;
                 // now brush is a bitmap
                 float  alphaArray[1] = { 1.0 } ;
                 wxBitmap* bmp = brush.GetStipple() ;

-                if ( bmp && bmp->Ok() ) 
+                if ( bmp && bmp->Ok() )

                 {
                     wxMacCFRefHolder<CGColorSpaceRef> patternSpace( CGColorSpaceCreatePattern( NULL ) ) ;
                     CGContextSetFillColorSpace( m_cgContext , patternSpace ) ;
                 {
                     wxMacCFRefHolder<CGColorSpaceRef> patternSpace( CGColorSpaceCreatePattern( NULL ) ) ;
                     CGContextSetFillColorSpace( m_cgContext , patternSpace ) ;


@@ -758,13 +774,13 @@ void AddEllipticArcToPath(CGContextRef c, CGPoint center, float a, float b, floa
     CGContextAddArc(c, 0, 0, 1, DegToRad(fromDegree), DegToRad(toDegree), 0);
     CGContextClosePath(c);
     CGContextRestoreGState(c);
     CGContextAddArc(c, 0, 0, 1, DegToRad(fromDegree), DegToRad(toDegree), 0);
     CGContextClosePath(c);
     CGContextRestoreGState(c);

-} 
+}

 
 void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth,
       float ovalHeight)
 {
     float fw, fh;
 
 void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth,
       float ovalHeight)
 {
     float fw, fh;

-    if (ovalWidth == 0 || ovalHeight == 0) 
+    if (ovalWidth == 0 || ovalHeight == 0)

     {
         CGContextAddRect(c, rect);
         return;
     {
         CGContextAddRect(c, rect);
         return;


@@ -773,20 +789,24 @@ void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth,
     CGContextSaveGState(c);
     CGContextTranslateCTM(c, CGRectGetMinX(rect), CGRectGetMinY(rect));
     CGContextScaleCTM(c, ovalWidth, ovalHeight);
     CGContextSaveGState(c);
     CGContextTranslateCTM(c, CGRectGetMinX(rect), CGRectGetMinY(rect));
     CGContextScaleCTM(c, ovalWidth, ovalHeight);

+

     fw = CGRectGetWidth(rect) / ovalWidth;
     fh = CGRectGetHeight(rect) / ovalHeight;
     fw = CGRectGetWidth(rect) / ovalWidth;
     fh = CGRectGetHeight(rect) / ovalHeight;

-    CGContextMoveToPoint(c, fw, fh/2);
-    CGContextAddArcToPoint(c, fw, fh, fw/2, fh, 1);
-    CGContextAddArcToPoint(c, 0, fh, 0, fh/2, 1);
-    CGContextAddArcToPoint(c, 0, 0, fw/2, 0, 1);
-    CGContextAddArcToPoint(c, fw, 0, fw, fh/2, 1);
+
+    CGContextMoveToPoint(c, fw, fh / 2);
+    CGContextAddArcToPoint(c, fw, fh, fw / 2, fh, 1);
+    CGContextAddArcToPoint(c, 0, fh, 0, fh / 2, 1);
+    CGContextAddArcToPoint(c, 0, 0, fw / 2, 0, 1);
+    CGContextAddArcToPoint(c, fw, 0, fw, fh / 2, 1);

     CGContextClosePath(c);
     CGContextRestoreGState(c);
     CGContextClosePath(c);
     CGContextRestoreGState(c);

-} 
+}
+
+#pragma mark -

 
 wxDC::wxDC()
 {
 
 wxDC::wxDC()
 {

-    m_ok = false;
+    m_ok = false ;

     m_colour = true;
     m_mm_to_pix_x = mm2pt;
     m_mm_to_pix_y = mm2pt;
     m_colour = true;
     m_mm_to_pix_x = mm2pt;
     m_mm_to_pix_y = mm2pt;


@@ -799,12 +819,12 @@ wxDC::wxDC()
     m_userScaleY = 1.0;
     m_scaleX = 1.0;
     m_scaleY = 1.0;
     m_userScaleY = 1.0;
     m_scaleX = 1.0;
     m_scaleY = 1.0;

-    m_needComputeScaleX = false;
+    m_needComputeScaleX =

     m_needComputeScaleY = false;
 
     m_needComputeScaleY = false;
 

-    m_ok = false ;

     m_macPort = 0 ;
     m_macPort = 0 ;

-    m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ;
+    m_macLocalOrigin.x =
+    m_macLocalOrigin.y = 0 ;

 
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
 
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;


@@ -822,13 +842,13 @@ wxDC::~wxDC()
         m_macATSUIStyle = NULL ;
     }
 
         m_macATSUIStyle = NULL ;
     }
 

-    delete m_graphicContext ;  
+    delete m_graphicContext ;

 }
 
 void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
 {
 }
 
 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( Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid DC") );
+    wxCHECK_RET( bmp.Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid bitmap") );

 
     wxCoord xx = XLOG2DEVMAC(x);
     wxCoord yy = YLOG2DEVMAC(y);
 
     wxCoord xx = XLOG2DEVMAC(x);
     wxCoord yy = YLOG2DEVMAC(y);


@@ -846,8 +866,8 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 
 void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 {
 
 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( Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid DC") );
+    wxCHECK_RET( icon.Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid icon") );

 
     wxCoord xx = XLOG2DEVMAC(x);
     wxCoord yy = YLOG2DEVMAC(y);
 
     wxCoord xx = XLOG2DEVMAC(x);
     wxCoord yy = YLOG2DEVMAC(y);


@@ -858,9 +878,9 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 
     CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
     CGRect r = CGRectMake( 00 , 00 , ww , hh ) ;
 
     CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
     CGRect r = CGRectMake( 00 , 00 , ww , hh ) ;

-    CGContextSaveGState(cg);    
+    CGContextSaveGState( cg );

     CGContextTranslateCTM( cg, xx , yy + hh );
     CGContextTranslateCTM( cg, xx , yy + hh );

-    CGContextScaleCTM(cg, 1, -1);
+    CGContextScaleCTM( cg, 1, -1 );

     PlotIconRefInContext( cg , &r , kAlignNone , kTransformNone ,
         NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ) ;
     CGContextRestoreGState( cg ) ;
     PlotIconRefInContext( cg , &r , kAlignNone , kTransformNone ,
         NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ) ;
     CGContextRestoreGState( cg ) ;


@@ -868,7 +888,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {

-    wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion  Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegion - invalid DC") );

 
     wxCoord xx, yy, ww, hh;
     xx = XLOG2DEVMAC(x);
 
     wxCoord xx, yy, ww, hh;
     xx = XLOG2DEVMAC(x);


@@ -877,7 +897,7 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
     hh = YLOG2DEVREL(height);
 
     CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
     hh = YLOG2DEVREL(height);
 
     CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;

-    CGRect clipRect = CGRectMake( xx ,yy , ww, hh ) ;
+    CGRect clipRect = CGRectMake( xx , yy , ww, hh ) ;

     CGContextClipToRect( cgContext , clipRect ) ;
 
 //    SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ;
     CGContextClipToRect( cgContext , clipRect ) ;
 
 //    SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ;


@@ -885,27 +905,29 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 
     if ( m_clipping )
     {
 
     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));
+        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;
     }
     else
     {
         m_clipping = true;

+

         m_clipX1 = xx;
         m_clipY1 = yy;
         m_clipX2 = xx + ww;
         m_clipY2 = yy + hh;
     }
 
         m_clipX1 = xx;
         m_clipY1 = yy;
         m_clipX2 = xx + ww;
         m_clipY2 = yy + hh;
     }
 

-    // TODO as soon as we don't reset the context for each operation anymore
+    // TODO: as soon as we don't reset the context for each operation anymore

     // we have to update the context as well
 }
 
     // we have to update the context as well
 }
 

-void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
+void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region )

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegionAsRegion - invalid DC") );
+

     if (region.Empty())
     {
         DestroyClippingRegion();
     if (region.Empty())
     {
         DestroyClippingRegion();


@@ -932,19 +954,20 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
         CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn ) ;
         if ( xx != x || yy != y )
             OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y ) ;
         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 ) ;
+        SectRgn( (RgnHandle)m_macCurrentClipRgn , (RgnHandle)m_macBoundaryClipRgn , (RgnHandle)m_macCurrentClipRgn ) ;

 #endif
 
         if ( m_clipping )
         {
 #endif
 
         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));
+            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;
         }
         else
         {
             m_clipping = true;

+

             m_clipX1 = xx;
             m_clipY1 = yy;
             m_clipX2 = xx + ww;
             m_clipX1 = xx;
             m_clipY1 = yy;
             m_clipX2 = xx + ww;


@@ -956,11 +979,14 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 void wxDC::DestroyClippingRegion()
 {
 //    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 void wxDC::DestroyClippingRegion()
 {
 //    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;

+

     CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
     CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;

-    CGContextRestoreGState( cgContext );    
-    CGContextSaveGState( cgContext );    
+    CGContextRestoreGState( cgContext );
+    CGContextSaveGState( cgContext );
+

     m_graphicContext->SetPen( m_pen ) ;
     m_graphicContext->SetBrush( m_brush ) ;
     m_graphicContext->SetPen( m_pen ) ;
     m_graphicContext->SetBrush( m_brush ) ;

+

     m_clipping = false;
 }
 
     m_clipping = false;
 }
 


@@ -977,7 +1003,7 @@ void wxDC::DoGetSizeMM( int* width, int* height ) const
 
 void wxDC::SetTextForeground( const wxColour &col )
 {
 
 void wxDC::SetTextForeground( const wxColour &col )
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::SetTextForeground - invalid DC") );

 
     if ( col != m_textForegroundColour )
     {
 
     if ( col != m_textForegroundColour )
     {


@@ -988,7 +1014,7 @@ void wxDC::SetTextForeground( const wxColour &col )
 
 void wxDC::SetTextBackground( const wxColour &col )
 {
 
 void wxDC::SetTextBackground( const wxColour &col )
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::SetTextBackground - invalid DC") );

 
     m_textBackgroundColour = col;
 }
 
     m_textBackgroundColour = col;
 }


@@ -1059,7 +1085,7 @@ void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {
     m_signX = (xLeftRight ?  1 : -1);
 void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {
     m_signX = (xLeftRight ?  1 : -1);

-    m_signY = (yBottomUp  ? -1 :  1);
+    m_signY = (yBottomUp ? -1 :  1);

     ComputeScaleAndOrigin();
 }
 
     ComputeScaleAndOrigin();
 }
 


@@ -1070,7 +1096,7 @@ wxSize wxDC::GetPPI() const
 
 int wxDC::GetDepth() const
 {
 
 int wxDC::GetDepth() const
 {

-    return 32 ;
+    return 32;

 }
 
 void wxDC::ComputeScaleAndOrigin()
 }
 
 void wxDC::ComputeScaleAndOrigin()


@@ -1091,26 +1117,26 @@ void wxDC::ComputeScaleAndOrigin()
         wxPen pen( GetPen() );
 
         m_pen = wxNullPen;
         wxPen pen( GetPen() );
 
         m_pen = wxNullPen;

-        SetPen(pen);
+        SetPen( pen );

     }
 }
 
     }
 }
 

-void  wxDC::SetPalette( const wxPalette& palette )
+void wxDC::SetPalette( const wxPalette& palette )

 {
 }
 
 {
 }
 

-void  wxDC::SetBackgroundMode( int mode )
+void wxDC::SetBackgroundMode( int mode )

 {
     m_backgroundMode = mode ;
 }
 
 {
     m_backgroundMode = mode ;
 }
 

-void  wxDC::SetFont( const wxFont &font )
+void wxDC::SetFont( const wxFont &font )

 {
     m_font = font;
     MacInstallFont() ;
 }
 
 {
     m_font = font;
     MacInstallFont() ;
 }
 

-void  wxDC::SetPen( const wxPen &pen )
+void wxDC::SetPen( const wxPen &pen )

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


@@ -1127,16 +1153,16 @@ void  wxDC::SetPen( const wxPen &pen )
             // we have to compensate for moved device origins etc. otherwise patterned pens are standing still
             // eg when using a wxScrollWindow and scrolling around
             CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
             // we have to compensate for moved device origins etc. otherwise patterned pens are standing still
             // eg when using a wxScrollWindow and scrolling around
             CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;

-            int origX = XLOG2DEVMAC(0) ;
-            int origY = YLOG2DEVMAC(0) ;
-            CGContextTranslateCTM (cgContext,origX,origY);
+            int origX = XLOG2DEVMAC( 0 ) ;
+            int origY = YLOG2DEVMAC( 0 ) ;
+            CGContextTranslateCTM( cgContext, origX, origY );

             m_graphicContext->SetPen( m_pen ) ;
             m_graphicContext->SetPen( m_pen ) ;

-            CGContextTranslateCTM (cgContext,-origX,-origY);
+            CGContextTranslateCTM( cgContext, -origX, -origY );

         }
     }
 }
 
         }
     }
 }
 

-void  wxDC::SetBrush( const wxBrush &brush )
+void wxDC::SetBrush( const wxBrush &brush )

 {
     if (m_brush == brush)
         return;
 {
     if (m_brush == brush)
         return;


@@ -1155,29 +1181,38 @@ void  wxDC::SetBrush( const wxBrush &brush )
             CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
             int origX = XLOG2DEVMAC(0) ;
             int origY = YLOG2DEVMAC(0) ;
             CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
             int origX = XLOG2DEVMAC(0) ;
             int origY = YLOG2DEVMAC(0) ;

-            CGContextTranslateCTM (cgContext,origX,origY);
+            CGContextTranslateCTM( cgContext, origX, origY );

             m_graphicContext->SetBrush( m_brush ) ;
             m_graphicContext->SetBrush( m_brush ) ;

-            CGContextTranslateCTM (cgContext,-origX,-origY);
+            CGContextTranslateCTM( cgContext, -origX, -origY );

         }
     }
 }
 
         }
     }
 }
 

-void  wxDC::SetBackground( const wxBrush &brush )
+void wxDC::SetBackground( const wxBrush &brush )

 {
     if (m_backgroundBrush == brush)
         return;
 {
     if (m_backgroundBrush == brush)
         return;

-    
+

     m_backgroundBrush = brush;
     if (!m_backgroundBrush.Ok())
         return;
 }
 
     m_backgroundBrush = brush;
     if (!m_backgroundBrush.Ok())
         return;
 }
 

-void  wxDC::SetLogicalFunction( int function )
+void wxDC::SetLogicalFunction( int function )

 {
     if (m_logicalFunction == function)
         return;
 
     m_logicalFunction = function ;
 {
     if (m_logicalFunction == function)
         return;
 
     m_logicalFunction = function ;

+#if wxMAC_USE_CORE_GRAPHICS_BLEND_MODES
+    CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
+    if ( m_logicalFunction == wxCOPY )
+        CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ;
+    else if ( m_logicalFunction == wxINVERT )
+        CGContextSetBlendMode( cgContext, kCGBlendModeExclusion ) ;
+    else
+        CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ;
+#endif

 }
 
 extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
 }
 
 extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,


@@ -1189,17 +1224,16 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
     return wxDoFloodFill(this, x, y, col, 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") );
-    wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel  Invalid DC") );
+    wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPixel - invalid DC") );

 
     wxMacPortSaver helper((CGrafPtr)m_macPort) ;
     RGBColor colour;
 
     // NB: GetCPixel is a deprecated QD call, and a slow one at that
 
     wxMacPortSaver helper((CGrafPtr)m_macPort) ;
     RGBColor colour;
 
     // NB: GetCPixel is a deprecated QD call, and a slow one at that

-    GetCPixel( 
-        XLOG2DEVMAC(x) + m_macLocalOriginInPort.x - m_macLocalOrigin.x, 
+    GetCPixel(
+        XLOG2DEVMAC(x) + m_macLocalOriginInPort.x - m_macLocalOrigin.x,

         YLOG2DEVMAC(y) + m_macLocalOriginInPort.y - m_macLocalOrigin.y, &colour );
 
     // convert from Mac colour to wx
         YLOG2DEVMAC(y) + m_macLocalOriginInPort.y - m_macLocalOrigin.y, &colour );
 
     // convert from Mac colour to wx


@@ -1208,20 +1242,22 @@ bool  wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const
     return true ;
 }
 
     return true ;
 }
 

-void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
+void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )

 {
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
-    
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawLine - invalid DC") );
+
+#if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES

     if ( m_logicalFunction != wxCOPY )
         return ;
     if ( m_logicalFunction != wxCOPY )
         return ;

-    
+#endif
+

     wxCoord xx1 = XLOG2DEVMAC(x1) ;
     wxCoord yy1 = YLOG2DEVMAC(y1) ;
     wxCoord xx2 = XLOG2DEVMAC(x2) ;
     wxCoord yy2 = YLOG2DEVMAC(y2) ;
 
     wxGraphicPath* path = m_graphicContext->CreatePath() ;
     wxCoord xx1 = XLOG2DEVMAC(x1) ;
     wxCoord yy1 = YLOG2DEVMAC(y1) ;
     wxCoord xx2 = XLOG2DEVMAC(x2) ;
     wxCoord yy2 = YLOG2DEVMAC(y2) ;
 
     wxGraphicPath* path = m_graphicContext->CreatePath() ;

-    path->MoveToPoint( xx1 , yy1 ) ;
+    path->MoveToPoint( xx1, yy1 ) ;

     path->AddLineToPoint( xx2 , yy2 ) ;
     path->CloseSubpath() ;
     m_graphicContext->StrokePath( path ) ;
     path->AddLineToPoint( xx2 , yy2 ) ;
     path->CloseSubpath() ;
     m_graphicContext->StrokePath( path ) ;


@@ -1231,21 +1267,21 @@ void  wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
     CalcBoundingBox(x2, y2);
 }
 
     CalcBoundingBox(x2, y2);
 }
 

-void  wxDC::DoCrossHair( wxCoord x, wxCoord y )
+void wxDC::DoCrossHair( wxCoord x, wxCoord y )

 {
 {

-    wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair  Invalid window dc") );
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoCrossHair - invalid DC") );

 
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     if ( m_logicalFunction != wxCOPY )
         return ;

-    
-    int w = 0;
-    int h = 0;
+
+    int w = 0, h = 0;
+

     GetSize( &w, &h );
     wxCoord xx = XLOG2DEVMAC(x);
     wxCoord yy = YLOG2DEVMAC(y);
 
     wxGraphicPath* path = m_graphicContext->CreatePath() ;
     GetSize( &w, &h );
     wxCoord xx = XLOG2DEVMAC(x);
     wxCoord yy = YLOG2DEVMAC(y);
 
     wxGraphicPath* path = m_graphicContext->CreatePath() ;

-    path->MoveToPoint( XLOG2DEVMAC(0), yy  ) ;
+    path->MoveToPoint( XLOG2DEVMAC(0), yy ) ;

     path->AddLineToPoint( XLOG2DEVMAC(w), yy ) ;
     path->CloseSubpath() ;
     path->MoveToPoint( xx, YLOG2DEVMAC(0) ) ;
     path->AddLineToPoint( XLOG2DEVMAC(w), yy ) ;
     path->CloseSubpath() ;
     path->MoveToPoint( xx, YLOG2DEVMAC(0) ) ;


@@ -1255,14 +1291,14 @@ void  wxDC::DoCrossHair( wxCoord x, wxCoord y )
     delete path ;
 
     CalcBoundingBox(x, y);
     delete path ;
 
     CalcBoundingBox(x, y);

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

 }
 
 }
 

-void  wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
+void wxDC::DoDrawArc( wxCoord x1, wxCoord y1,

                       wxCoord x2, wxCoord y2,
                       wxCoord xc, wxCoord yc )
 {
                       wxCoord x2, wxCoord y2,
                       wxCoord xc, wxCoord yc )
 {

-    wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc  Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawArc - invalid DC") );

 
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     if ( m_logicalFunction != wxCOPY )
         return ;


@@ -1276,7 +1312,7 @@ void  wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
 
     double dx = xx1 - xxc;
     double dy = yy1 - yyc;
 
     double dx = xx1 - xxc;
     double dy = yy1 - yyc;

-    double radius = sqrt((double)(dx*dx+dy*dy));
+    double radius = sqrt((double)(dx * dx + dy * dy));

     wxCoord rad = (wxCoord)radius;
     double sa, ea;
     if (xx1 == xx2 && yy1 == yy2)
     wxCoord rad = (wxCoord)radius;
     double sa, ea;
     if (xx1 == xx2 && yy1 == yy2)


@@ -1292,10 +1328,10 @@ void  wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
     {
         sa = (xx1 - xxc == 0) ?
             (yy1 - yyc < 0) ? 90.0 : -90.0 :
     {
         sa = (xx1 - xxc == 0) ?
             (yy1 - yyc < 0) ? 90.0 : -90.0 :

-        -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG;
+        -atan2(double(yy1 - yyc), double(xx1 - xxc)) * RAD2DEG;

         ea = (xx2 - xxc == 0) ?
             (yy2 - yyc < 0) ? 90.0 : -90.0 :
         ea = (xx2 - xxc == 0) ?
             (yy2 - yyc < 0) ? 90.0 : -90.0 :

-        -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG;
+        -atan2(double(yy2 - yyc), double(xx2 - xxc)) * RAD2DEG;

     }
 
     bool fill = m_brush.GetStyle() != wxTRANSPARENT ;
     }
 
     bool fill = m_brush.GetStyle() != wxTRANSPARENT ;


@@ -1306,17 +1342,17 @@ void  wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
     CGContextScaleCTM( ctx , 1 , -1 ) ;
     if ( fill )
         CGContextMoveToPoint( ctx , 0 , 0 ) ;
     CGContextScaleCTM( ctx , 1 , -1 ) ;
     if ( fill )
         CGContextMoveToPoint( ctx , 0 , 0 ) ;

-    CGContextAddArc( ctx, 0, 0 , rad , DegToRad(sa), DegToRad(ea), 0);
+    CGContextAddArc( ctx, 0, 0 , rad , DegToRad(sa), DegToRad(ea), 0 );

     if ( fill )
         CGContextAddLineToPoint( ctx , 0 , 0 ) ;
     CGContextRestoreGState( ctx ) ;
     CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ;
 }
 
     if ( fill )
         CGContextAddLineToPoint( ctx , 0 , 0 ) ;
     CGContextRestoreGState( ctx ) ;
     CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ;
 }
 

-void  wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,

                               double sa, double ea )
 {
                               double sa, double ea )
 {

-    wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc  Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawEllipticArc - invalid DC") );

 
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     if ( m_logicalFunction != wxCOPY )
         return ;


@@ -1344,31 +1380,33 @@ void  wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
     CGContextRef ctx = mctx->GetNativeContext() ;
 
     CGContextSaveGState( ctx ) ;
     CGContextRef ctx = mctx->GetNativeContext() ;
 
     CGContextSaveGState( ctx ) ;

-    CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2);
+    CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2 );

     CGContextScaleCTM( ctx , 1 * ww / 2 , -1 * hh / 2 ) ;
     if ( fill )
         CGContextMoveToPoint( ctx , 0 , 0 ) ;
     CGContextScaleCTM( ctx , 1 * ww / 2 , -1 * hh / 2 ) ;
     if ( fill )
         CGContextMoveToPoint( ctx , 0 , 0 ) ;

-    CGContextAddArc( ctx, 0, 0, 1, DegToRad(sa), DegToRad(ea), 0);
+    CGContextAddArc( ctx, 0, 0, 1, DegToRad( sa ), DegToRad( ea ), 0 );

     if ( fill )
         CGContextAddLineToPoint( ctx , 0 , 0 ) ;
     CGContextRestoreGState( ctx ) ;
     if ( fill )
         CGContextAddLineToPoint( ctx , 0 , 0 ) ;
     CGContextRestoreGState( ctx ) ;

-    CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ;    
+    CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ;

 }
 
 }
 

-void  wxDC::DoDrawPoint( wxCoord x, wxCoord y )
+void wxDC::DoDrawPoint( wxCoord x, wxCoord y )

 {
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawPoint - invalid DC") );

 
     DoDrawLine( x , y , x + 1 , y + 1 ) ;
 }
 
 
     DoDrawLine( x , y , x + 1 , y + 1 ) ;
 }
 

-void  wxDC::DoDrawLines(int n, wxPoint points[],
+void wxDC::DoDrawLines(int n, wxPoint points[],

                         wxCoord xoffset, wxCoord yoffset)
 {
                         wxCoord xoffset, wxCoord yoffset)
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawLines - invalid DC") );

 
 

+#if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES

     if ( m_logicalFunction != wxCOPY )
         return ;
     if ( m_logicalFunction != wxCOPY )
         return ;

+#endif

 
     wxCoord x1, x2 , y1 , y2 ;
     x1 = XLOG2DEVMAC(points[0].x + xoffset);
 
     wxCoord x1, x2 , y1 , y2 ;
     x1 = XLOG2DEVMAC(points[0].x + xoffset);


@@ -1390,34 +1428,34 @@ void  wxDC::DoDrawLines(int n, wxPoint points[],
 #if wxUSE_SPLINES
 void wxDC::DoDrawSpline(wxList *points)
 {
 #if wxUSE_SPLINES
 void wxDC::DoDrawSpline(wxList *points)
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
-    
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawSpline - invalid DC") );
+

     if ( m_logicalFunction != wxCOPY )
         return ;
     if ( m_logicalFunction != wxCOPY )
         return ;

-    
+

     wxGraphicPath* path = m_graphicContext->CreatePath() ;
     wxGraphicPath* path = m_graphicContext->CreatePath() ;

-    
+

     wxList::compatibility_iterator node = points->GetFirst();
     if (node == wxList::compatibility_iterator())
         // empty list
         return;
     wxList::compatibility_iterator node = points->GetFirst();
     if (node == wxList::compatibility_iterator())
         // empty list
         return;

-    
+

     wxPoint *p = (wxPoint *)node->GetData();
     wxPoint *p = (wxPoint *)node->GetData();

-    
+

     wxCoord x1 = p->x;
     wxCoord y1 = p->y;
     wxCoord x1 = p->x;
     wxCoord y1 = p->y;

-    
+

     node = node->GetNext();
     p = (wxPoint *)node->GetData();
     node = node->GetNext();
     p = (wxPoint *)node->GetData();

-    
+

     wxCoord x2 = p->x;
     wxCoord y2 = p->y;
     wxCoord cx1 = ( x1 + x2 ) / 2;
     wxCoord cy1 = ( y1 + y2 ) / 2;
     wxCoord x2 = p->x;
     wxCoord y2 = p->y;
     wxCoord cx1 = ( x1 + x2 ) / 2;
     wxCoord cy1 = ( y1 + y2 ) / 2;

-    
+

     path->MoveToPoint( XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) ) ;
     path->AddLineToPoint( XLOG2DEVMAC( cx1 ) , XLOG2DEVMAC( cy1 ) ) ;
     path->MoveToPoint( XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) ) ;
     path->AddLineToPoint( XLOG2DEVMAC( cx1 ) , XLOG2DEVMAC( cy1 ) ) ;

-    
+

 #if !wxUSE_STL
     while ((node = node->GetNext()) != NULL)
 #else
 #if !wxUSE_STL
     while ((node = node->GetNext()) != NULL)
 #else


@@ -1431,26 +1469,27 @@ void wxDC::DoDrawSpline(wxList *points)
         y2 = p->y;
         wxCoord cx4 = (x1 + x2) / 2;
         wxCoord cy4 = (y1 + y2) / 2;
         y2 = p->y;
         wxCoord cx4 = (x1 + x2) / 2;
         wxCoord cy4 = (y1 + y2) / 2;

-        
-        path->AddQuadCurveToPoint( XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) , 
-                                   XLOG2DEVMAC( cx4 ) , XLOG2DEVMAC( cy4 ) ) ;
-        
+
+        path->AddQuadCurveToPoint(
+            XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) ,
+            XLOG2DEVMAC( cx4 ) , XLOG2DEVMAC( cy4 ) ) ;
+

         cx1 = cx4;
         cy1 = cy4;
     }
         cx1 = cx4;
         cy1 = cy4;
     }

-            
+

     path->AddLineToPoint( XLOG2DEVMAC( x2 ) , XLOG2DEVMAC( y2 ) ) ;
     path->AddLineToPoint( XLOG2DEVMAC( x2 ) , XLOG2DEVMAC( y2 ) ) ;

-    
+

     m_graphicContext->StrokePath( path ) ;
     delete path ;
 }
 #endif
 
     m_graphicContext->StrokePath( path ) ;
     delete path ;
 }
 #endif
 

-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"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawPolygon - invalid DC") );

 
     if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) )
         return ;
 
     if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) )
         return ;


@@ -1460,7 +1499,7 @@ void  wxDC::DoDrawPolygon( int n, wxPoint points[],
     wxCoord x1, x2 , y1 , y2 ;
     x2 = x1 = XLOG2DEVMAC(points[0].x + xoffset);
     y2 = y1 = YLOG2DEVMAC(points[0].y + yoffset);
     wxCoord x1, x2 , y1 , y2 ;
     x2 = x1 = XLOG2DEVMAC(points[0].x + xoffset);
     y2 = y1 = YLOG2DEVMAC(points[0].y + yoffset);

-    
+

     wxGraphicPath* path = m_graphicContext->CreatePath() ;
     path->MoveToPoint( x1 , y1 ) ;
     for (int i = 1; i < n; i++)
     wxGraphicPath* path = m_graphicContext->CreatePath() ;
     path->MoveToPoint( x1 , y1 ) ;
     for (int i = 1; i < n; i++)


@@ -1472,7 +1511,7 @@ void  wxDC::DoDrawPolygon( int n, wxPoint points[],
     }
 
     if ( x1 != x2 || y1 != y2 )
     }
 
     if ( x1 != x2 || y1 != y2 )

-        path->AddLineToPoint( x1,y1 ) ;
+        path->AddLineToPoint( x1, y1 ) ;

 
     path->CloseSubpath() ;
     m_graphicContext->DrawPath( path , fillStyle ) ;
 
     path->CloseSubpath() ;
     m_graphicContext->DrawPath( path , fillStyle ) ;


@@ -1482,7 +1521,7 @@ void  wxDC::DoDrawPolygon( int n, wxPoint points[],
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRectangle - invalid DC") );

 
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     if ( m_logicalFunction != wxCOPY )
         return ;


@@ -1514,11 +1553,11 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
     delete path ;
 }
 
     delete path ;
 }
 

-void  wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,

                                    wxCoord width, wxCoord height,
                                    double radius)
 {
                                    wxCoord width, wxCoord height,
                                    double radius)
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRoundedRectangle - invalid DC") );

 
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     if ( m_logicalFunction != wxCOPY )
         return ;


@@ -1548,13 +1587,13 @@ void  wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
 
     wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ;
     CGContextRef ctx = mctx->GetNativeContext() ;
 
     wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ;
     CGContextRef ctx = mctx->GetNativeContext() ;

-    AddRoundedRectToPath( ctx  , CGRectMake( xx , yy , ww , hh ) , 16 ,16  ) ;
+    AddRoundedRectToPath( ctx , CGRectMake( xx , yy , ww , hh ) , radius , radius ) ;

     CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ;
 }
 
     CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ;
 }
 

-void  wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawEllipse - invalid DC") );

 
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     if ( m_logicalFunction != wxCOPY )
         return ;


@@ -1563,6 +1602,7 @@ void  wxDC::DoDrawEllipse(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
     if (ww == 0 || hh == 0)
         return;
     // CMB: draw nothing if transformed w or h is 0
     if (ww == 0 || hh == 0)
         return;


@@ -1582,24 +1622,25 @@ void  wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
     wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ;
     CGContextRef ctx = mctx->GetNativeContext() ;
     CGContextSaveGState( ctx ) ;
     wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ;
     CGContextRef ctx = mctx->GetNativeContext() ;
     CGContextSaveGState( ctx ) ;

-    CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2);
+    CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2 );

     CGContextScaleCTM( ctx , ww / 2 , hh / 2 ) ;
     CGContextScaleCTM( ctx , ww / 2 , hh / 2 ) ;

-    CGContextAddArc( ctx, 0, 0, 1,  0 , 2*M_PI , 0);
+    CGContextAddArc( ctx, 0, 0, 1, 0 , 2 * M_PI , 0 );

     CGContextRestoreGState( ctx ) ;
     CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ;
 }
 
     CGContextRestoreGState( ctx ) ;
     CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ;
 }
 

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

 {
     return true ;
 }
 
 {
     return true ;
 }
 

-bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-                   wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask,
-                   wxCoord xsrcMask,  wxCoord ysrcMask )
+bool wxDC::DoBlit(
+    wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+    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(cg)::DoBlit - invalid DC") );
+    wxCHECK_MSG( source->Ok(), false, wxT("wxDC(cg)::DoBlit - invalid source DC") );

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


@@ -1611,24 +1652,25 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     }
 
     wxCoord yysrc = source->YLOG2DEVMAC(ysrc) ;
     }
 
     wxCoord yysrc = source->YLOG2DEVMAC(ysrc) ;

-    wxCoord xxsrc = source->XLOG2DEVMAC(xsrc)  ;
-    wxCoord wwsrc = source->XLOG2DEVREL(width ) ;
+    wxCoord xxsrc = source->XLOG2DEVMAC(xsrc) ;
+    wxCoord wwsrc = source->XLOG2DEVREL(width) ;

     wxCoord hhsrc = source->YLOG2DEVREL(height) ;
     wxCoord hhsrc = source->YLOG2DEVREL(height) ;

-    
+

     wxCoord yydest = YLOG2DEVMAC(ydest) ;
     wxCoord xxdest = XLOG2DEVMAC(xdest) ;
     wxCoord yydest = YLOG2DEVMAC(ydest) ;
     wxCoord xxdest = XLOG2DEVMAC(xdest) ;

-    wxCoord wwdest = XLOG2DEVREL(width ) ;
+    wxCoord wwdest = XLOG2DEVREL(width) ;

     wxCoord hhdest = YLOG2DEVREL(height) ;
     wxCoord hhdest = YLOG2DEVREL(height) ;

-    
+

     wxMemoryDC* memdc = dynamic_cast<wxMemoryDC*>(source) ;
     if ( memdc && logical_func == wxCOPY )
     {
         wxBitmap blit = memdc->GetSelectedObject() ;
     wxMemoryDC* memdc = dynamic_cast<wxMemoryDC*>(source) ;
     if ( memdc && logical_func == wxCOPY )
     {
         wxBitmap blit = memdc->GetSelectedObject() ;

+

         wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") ) ;
 
         wxCoord bmpwidth = blit.GetWidth();
         wxCoord bmpheight = blit.GetHeight();
         wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") ) ;
 
         wxCoord bmpwidth = blit.GetWidth();
         wxCoord bmpheight = blit.GetHeight();

-        
+

         if ( xxsrc != 0 || yysrc != 0 || bmpwidth != wwsrc || bmpheight != hhsrc )
         {
             wwsrc = wxMin( wwsrc , bmpwidth - xxsrc ) ;
         if ( xxsrc != 0 || yysrc != 0 || bmpwidth != wwsrc || bmpheight != hhsrc )
         {
             wwsrc = wxMin( wwsrc , bmpwidth - xxsrc ) ;


@@ -1675,21 +1717,22 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     return true;
 }
 
     return true;
 }
 

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

                               double angle)
 {
                               double angle)
 {

-    wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText  Invalid window dc") );
-    wxCHECK_RET( m_macATSUIStyle != NULL , wxT("No valid font set") ) ;
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRotatedText - invalid DC") );
+    wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoDrawRotatedText - no valid font set") );

 
 

-    if ( str.Length() == 0 )
+    if ( str.length() == 0 )

         return ;
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;
         return ;
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;

-    UniCharCount chars = str.Length() ;
+    UniCharCount chars = str.length() ;

     UniChar* ubuf = NULL ;
     UniChar* ubuf = NULL ;

+

 #if SIZEOF_WCHAR_T == 4
     wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 4
     wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE


@@ -1698,7 +1741,7 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
     converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ;
 #else
     const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ;
     converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ;
 #else
     const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ;

-    size_t unicharlen = converter.WC2MB( NULL , wchar.data()  , 0 ) ;
+    size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ;

     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
     converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ;
 #endif
     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
     converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ;
 #endif


@@ -1720,10 +1763,10 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 
     wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") );
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 
     wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") );

-    
+

     status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ;
     wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
     status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ;
     wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );

-    
+

     int iAngle = int( angle );
     if ( abs(iAngle) > 0 )
     {
     int iAngle = int( angle );
     if ( abs(iAngle) > 0 )
     {


@@ -1732,15 +1775,15 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
         {
             kATSULineRotationTag ,
         } ;
         {
             kATSULineRotationTag ,
         } ;

-        ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+        ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =

         {
             sizeof( Fixed ) ,
         } ;
         {
             sizeof( Fixed ) ,
         } ;

-        ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+        ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =

         {
             &atsuAngle ,
         } ;
         {
             &atsuAngle ,
         } ;

-        status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag),
+        status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),

             atsuTags, atsuSizes, atsuValues ) ;
     }
 
             atsuTags, atsuSizes, atsuValues ) ;
     }
 


@@ -1750,62 +1793,61 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
         {
             kATSUCGContextTag ,
         } ;
         {
             kATSUCGContextTag ,
         } ;

-        ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+        ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =

         {
             sizeof( CGContextRef ) ,
         } ;
         {
             sizeof( CGContextRef ) ,
         } ;

-        ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+        ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =

         {
             &cgContext ,
         } ;
         {
             &cgContext ,
         } ;

-        status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag),
+        status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),

             atsuTags, atsuSizes, atsuValues ) ;
     }
 
             atsuTags, atsuSizes, atsuValues ) ;
     }
 

-    ATSUTextMeasurement textBefore ;
-    ATSUTextMeasurement textAfter ;
-    ATSUTextMeasurement ascent ;
-    ATSUTextMeasurement descent ;
+    ATSUTextMeasurement textBefore, textAfter ;
+    ATSUTextMeasurement ascent, descent ;

 
     status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
         &textBefore , &textAfter, &ascent , &descent );
 
     status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
         &textBefore , &textAfter, &ascent , &descent );

+

     wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
     wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );

-    
+

     Rect rect ;
     Rect rect ;

-    
+

     if ( m_backgroundMode == wxSOLID )
     {
         wxGraphicPath* path = m_graphicContext->CreatePath() ;
     if ( m_backgroundMode == wxSOLID )
     {
         wxGraphicPath* path = m_graphicContext->CreatePath() ;

-        path->MoveToPoint( 
-            drawX , 
-            drawY ) ;
-        path->AddLineToPoint( 
-            (int) (drawX + sin(angle/RAD2DEG) * FixedToInt(ascent + descent)) , 
-            (int) (drawY + cos(angle/RAD2DEG) * FixedToInt(ascent + descent)) ) ;
-        path->AddLineToPoint( 
-            (int) (drawX + sin(angle/RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle/RAD2DEG) * FixedToInt(textAfter)) ,
-            (int) (drawY + cos(angle/RAD2DEG) * FixedToInt(ascent + descent) - sin(angle/RAD2DEG) * FixedToInt(textAfter)) ) ;
-        path->AddLineToPoint( 
-            (int) (drawX + cos(angle/RAD2DEG) * FixedToInt(textAfter)) , 
-            (int) (drawY - sin(angle/RAD2DEG) * FixedToInt(textAfter)) ) ;
-            
+        path->MoveToPoint( drawX , drawY ) ;
+        path->AddLineToPoint(
+            (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent)) ,
+            (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent)) ) ;
+        path->AddLineToPoint(
+            (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle / RAD2DEG) * FixedToInt(textAfter)) ,
+            (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent) - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ) ;
+        path->AddLineToPoint(
+            (int) (drawX + cos(angle / RAD2DEG) * FixedToInt(textAfter)) ,
+            (int) (drawY - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ) ;
+

         m_graphicContext->FillPath( path , m_textBackgroundColour ) ;
         delete path ;
     }
 
         m_graphicContext->FillPath( path , m_textBackgroundColour ) ;
         delete path ;
     }
 

-    drawX += (int)(sin(angle/RAD2DEG) * FixedToInt(ascent));
-    drawY += (int)(cos(angle/RAD2DEG) * FixedToInt(ascent));
+    drawX += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent));
+    drawY += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent));

 
     status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
         IntToFixed(drawX) , IntToFixed(drawY) , &rect );
     wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
 
 
     status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
         IntToFixed(drawX) , IntToFixed(drawY) , &rect );
     wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
 

-    CGContextSaveGState(((wxMacCGContext*)(m_graphicContext))->GetNativeContext());    
+    CGContextSaveGState(((wxMacCGContext*)(m_graphicContext))->GetNativeContext());

     CGContextTranslateCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), drawX, drawY);
     CGContextScaleCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), 1, -1);
     status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
         IntToFixed(0) , IntToFixed(0) );
     CGContextTranslateCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), drawX, drawY);
     CGContextScaleCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), 1, -1);
     status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
         IntToFixed(0) , IntToFixed(0) );

+

     wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") );
     wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") );

+

     CGContextRestoreGState( ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ) ;
 
     CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) );
     CGContextRestoreGState( ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ) ;
 
     CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) );


@@ -1818,43 +1860,44 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
 #endif
 }
 
 #endif
 }
 

-void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
+void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)

 {
 {

-    wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText  Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawText - invalid DC") );

 
     DoDrawRotatedText( strtext , x , y , 0.0 ) ;
 }
 
 
     DoDrawRotatedText( strtext , x , y , 0.0 ) ;
 }
 

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

 {
 {

-    wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));
+    wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::CanGetTextExtent - invalid DC") );

 
     return true ;
 }
 
 
     return true ;
 }
 

-void  wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
+void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,

                             wxCoord *descent, wxCoord *externalLeading ,
                             wxFont *theFont ) const
 {
                             wxCoord *descent, wxCoord *externalLeading ,
                             wxFont *theFont ) const
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoGetTextExtent - invalid DC") );

 
     wxFont formerFont = m_font ;
     if ( theFont )
     {
 
     wxFont formerFont = m_font ;
     if ( theFont )
     {

-        // work around the constness
+        // work around the const-ness

         *((wxFont*)(&m_font)) = *theFont ;
         *((wxFont*)(&m_font)) = *theFont ;

-        MacInstallFont() ;   
+        MacInstallFont() ;

     }
 
     }
 

-    if ( str.Length() == 0 )
+    if ( str.empty() )

         return ;
         return ;

-    
-    wxCHECK_RET( m_macATSUIStyle != NULL , wxT("No valid font set") ) ;
-    
+
+    wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ;
+

     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;

-    UniCharCount chars = str.Length() ;
+    UniCharCount chars = str.length() ;

     UniChar* ubuf = NULL ;
     UniChar* ubuf = NULL ;

+

 #if SIZEOF_WCHAR_T == 4
     wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 4
     wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE


@@ -1863,7 +1906,7 @@ void  wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
     converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ;
 #else
     const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ;
     converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ;
 #else
     const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ;

-    size_t unicharlen = converter.WC2MB( NULL , wchar.data()  , 0 ) ;
+    size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ;

     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
     converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ;
 #endif
     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
     converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ;
 #endif


@@ -1882,15 +1925,13 @@ void  wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 
     wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 
     wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );

-    
-    ATSUTextMeasurement textBefore ;
-    ATSUTextMeasurement textAfter ;
-    ATSUTextMeasurement textAscent ;
-    ATSUTextMeasurement textDescent ;
+
+    ATSUTextMeasurement textBefore, textAfter ;
+    ATSUTextMeasurement textAscent, textDescent ;

 
     status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
         &textBefore , &textAfter, &textAscent , &textDescent );
 
     status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
         &textBefore , &textAfter, &textAscent , &textDescent );

-        
+

     if ( height )
         *height = YDEV2LOGREL( FixedToInt(textAscent + textDescent) ) ;
     if ( descent )
     if ( height )
         *height = YDEV2LOGREL( FixedToInt(textAscent + textDescent) ) ;
     if ( descent )


@@ -1899,11 +1940,13 @@ void  wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
         *externalLeading = 0 ;
     if ( width )
         *width = XDEV2LOGREL( FixedToInt(textAfter - textBefore) ) ;
         *externalLeading = 0 ;
     if ( width )
         *width = XDEV2LOGREL( FixedToInt(textAfter - textBefore) ) ;

-    
+

     ::ATSUDisposeTextLayout(atsuLayout);
     ::ATSUDisposeTextLayout(atsuLayout);

+

 #if SIZEOF_WCHAR_T == 4
     free( ubuf ) ;
 #endif
 #if SIZEOF_WCHAR_T == 4
     free( ubuf ) ;
 #endif

+

     if ( theFont )
     {
         // work around the constness
     if ( theFont )
     {
         // work around the constness


@@ -1914,17 +1957,18 @@ void  wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
 
 bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
 {
 
 bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
 {

-    wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));
+    wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPartialTextExtents - invalid DC") );

 
     widths.Empty();
 
     widths.Empty();

-    widths.Add(0, text.Length());
+    widths.Add(0, text.length());

 
 

-    if (text.Length() == 0)
+    if (text.empty())

         return false;
         return false;

-    
+

     ATSUTextLayout atsuLayout ;
     ATSUTextLayout atsuLayout ;

-    UniCharCount chars = text.Length() ;
+    UniCharCount chars = text.length() ;

     UniChar* ubuf = NULL ;
     UniChar* ubuf = NULL ;

+

 #if SIZEOF_WCHAR_T == 4
     wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 4
     wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE


@@ -1933,7 +1977,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 ) ;
 #else
     const wxWCharBuffer wchar = text.wc_str( wxConvLocal ) ;
     converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 ) ;
 #else
     const wxWCharBuffer wchar = text.wc_str( wxConvLocal ) ;

-    size_t unicharlen = converter.WC2MB( NULL , wchar.data()  , 0 ) ;
+    size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ;

     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
     converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ;
 #endif
     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
     converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ;
 #endif


@@ -1951,14 +1995,14 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     OSStatus status;
     status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
     OSStatus status;
     status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;

-        
+

     for ( int pos = 0; pos < (int)chars; pos ++ )
     {
         unsigned long actualNumberOfBounds = 0;
         ATSTrapezoid glyphBounds;
 
         // We get a single bound, since the text should only require one. If it requires more, there is an issue
     for ( int pos = 0; pos < (int)chars; pos ++ )
     {
         unsigned long actualNumberOfBounds = 0;
         ATSTrapezoid glyphBounds;
 
         // We get a single bound, since the text should only require one. If it requires more, there is an issue

-        OSStatus result; 
+        OSStatus result;

         result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1,
             kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds );
         if (result != noErr || actualNumberOfBounds != 1 )
         result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1,
             kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds );
         if (result != noErr || actualNumberOfBounds != 1 )


@@ -1972,31 +2016,31 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     return true;
 }
 
     return true;
 }
 

-wxCoord   wxDC::GetCharWidth(void) const
+wxCoord wxDC::GetCharWidth(void) const

 {
     wxCoord width ;
 {
     wxCoord width ;

-    DoGetTextExtent(wxT("g") , &width , NULL , NULL , NULL , NULL ) ;
+    DoGetTextExtent( wxT("g") , &width , NULL , NULL , NULL , NULL ) ;

 
     return width ;
 }
 
 
     return width ;
 }
 

-wxCoord   wxDC::GetCharHeight(void) const
+wxCoord wxDC::GetCharHeight(void) const

 {
     wxCoord height ;
 {
     wxCoord height ;

-    DoGetTextExtent(wxT("g") , NULL , &height , NULL , NULL , NULL ) ;
+    DoGetTextExtent( wxT("g") , NULL , &height , NULL , NULL , NULL ) ;

 
     return height ;
 }
 
 
     return height ;
 }
 

-void  wxDC::Clear(void)
+void wxDC::Clear(void)

 {
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::Clear - invalid DC") );

 
     if (m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT)
 
     if (m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT)

-    {      
+    {

         HIRect rect = CGRectMake( -10000 , -10000 , 20000 , 20000 ) ;
         CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
         HIRect rect = CGRectMake( -10000 , -10000 , 20000 , 20000 ) ;
         CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;

-        switch( m_backgroundBrush.MacGetBrushKind() )
+        switch ( m_backgroundBrush.MacGetBrushKind() )

         {
             case kwxMacBrushTheme :
                 {
         {
             case kwxMacBrushTheme :
                 {


@@ -2033,12 +2077,12 @@ void  wxDC::Clear(void)
                         HIThemeBackgroundDrawInfo drawInfo ;
                         drawInfo.version = 0 ;
                         drawInfo.state = kThemeStateActive ;
                         HIThemeBackgroundDrawInfo drawInfo ;
                         drawInfo.version = 0 ;
                         drawInfo.state = kThemeStateActive ;

-                        drawInfo.kind = m_backgroundBrush.MacGetThemeBackground(NULL) ;
+                        drawInfo.kind = m_backgroundBrush.MacGetThemeBackground( NULL ) ;

                         if ( drawInfo.kind == kThemeBackgroundMetal )
                         if ( drawInfo.kind == kThemeBackgroundMetal )

-                            HIThemeDrawBackground( &rect , &drawInfo, cg ,
-                                kHIThemeOrientationNormal) ;
-                            HIThemeApplyBackground( &rect , &drawInfo, cg ,
-                                kHIThemeOrientationNormal) ;
+                        {
+                            HIThemeDrawBackground( &rect, &drawInfo, cg, kHIThemeOrientationNormal ) ;
+                            HIThemeApplyBackground( &rect, &drawInfo, cg, kHIThemeOrientationNormal ) ;
+                        }

                     }
 #endif
                 }
                     }
 #endif
                 }


@@ -2046,6 +2090,9 @@ void  wxDC::Clear(void)
 
             case kwxMacBrushColour :
                 {
 
             case kwxMacBrushColour :
                 {

+                    // FIXME: doesn't correctly render stippled brushes !!
+                    // FIXME: should this be replaced by ::SetBrush() ??
+

                     RGBColor col = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()) ;
                     CGContextSetRGBFillColor( cg , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ;
                     CGContextFillRect(cg, rect);
                     RGBColor col = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()) ;
                     CGContextSetRGBFillColor( cg , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ;
                     CGContextFillRect(cg, rect);


@@ -2065,7 +2112,7 @@ void  wxDC::Clear(void)
 
 void wxDC::MacInstallFont() const
 {
 
 void wxDC::MacInstallFont() const
 {

-    wxCHECK_RET(Ok(), wxT("Invalid DC"));
+    wxCHECK_RET( Ok(), wxT("wxDC(cg)::MacInstallFont - invalid DC") );

 
     if ( m_macATSUIStyle )
     {
 
     if ( m_macATSUIStyle )
     {


@@ -2075,9 +2122,11 @@ void wxDC::MacInstallFont() const
 
     if ( m_font.Ok() )
     {
 
     if ( m_font.Ok() )
     {

-        OSStatus status = noErr ;
+        OSStatus status ;
+

         status = ATSUCreateAndCopyStyle( (ATSUStyle) m_font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ;
         status = ATSUCreateAndCopyStyle( (ATSUStyle) m_font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ;

-        wxASSERT_MSG( status == noErr , wxT("couldn't set create ATSU style") ) ;
+
+        wxASSERT_MSG( status == noErr, wxT("couldn't create ATSU style") ) ;

 
         Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ;
         RGBColor atsuColor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) ;
 
         Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ;
         RGBColor atsuColor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) ;


@@ -2086,26 +2135,27 @@ void wxDC::MacInstallFont() const
                 kATSUSizeTag ,
                 kATSUColorTag ,
         } ;
                 kATSUSizeTag ,
                 kATSUColorTag ,
         } ;

-        ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+        ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =

         {
                 sizeof( Fixed ) ,
                 sizeof( RGBColor ) ,
         } ;
         {
                 sizeof( Fixed ) ,
                 sizeof( RGBColor ) ,
         } ;

-        // Boolean kTrue = true ;
-        // Boolean kFalse = false ;
-        // ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal;
-        ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+        ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =

         {
                 &atsuSize ,
                 &atsuColor ,
         } ;
         {
                 &atsuSize ,
                 &atsuColor ,
         } ;

-        status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag) ,
+
+        status = ::ATSUSetAttributes(
+            (ATSUStyle)m_macATSUIStyle, sizeof(atsuTags) / sizeof(ATSUAttributeTag) ,

             atsuTags, atsuSizes, atsuValues);
 
             atsuTags, atsuSizes, atsuValues);
 

-        wxASSERT_MSG( status == noErr , wxT("couldn't Modify ATSU style") ) ;
+        wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ;

     }
 }
 
     }
 }
 

+#pragma mark -
+

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


@@ -2151,4 +2201,3 @@ wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 }
 
 #endif // wxMAC_USE_CORE_GRAPHICS
 }
 
 #endif // wxMAC_USE_CORE_GRAPHICS

-