use correct scale when drawing

[wxWidgets.git] / src / osx / carbon / graphics.cpp

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index d4871e718f017f1109aabdab4018ee8ad3848e21..c42ffba7f76ec97ca77bdd9294b55fafbe8baddd 100644 (file)
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -147,27 +147,13 @@ OSStatus wxMacDrawCGImage(
 
 CGColorRef wxMacCreateCGColor( const wxColour& col )
 {
 
 CGColorRef wxMacCreateCGColor( const wxColour& col )
 {

-    CGColorRef retval = 0;
-#ifdef __WXMAC__
-    retval = col.CreateCGColor();
-#else
-// TODO add conversion NSColor - CGColorRef (obj-c)
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    if ( CGColorCreateGenericRGB )
-        retval = CGColorCreateGenericRGB( col.Red() / 255.0 , col.Green() / 255.0, col.Blue() / 255.0, col.Alpha() / 255.0 );
-    else
-#endif
-    {
-        CGFloat components[4] = { col.Red() / 255.0, col.Green() / 255.0, col.Blue()  / 255.0, col.Alpha() / 255.0 } ;
-        retval = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
-    }
+    CGColorRef retval = col.CreateCGColor();

 
 

-#endif

     wxASSERT(retval != NULL);
     return retval;
 }
 
     wxASSERT(retval != NULL);
     return retval;
 }
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 && wxOSX_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

 
 CTFontRef wxMacCreateCTFont( const wxFont& font )
 {
 
 CTFontRef wxMacCreateCTFont( const wxFont& font )
 {


@@ -1500,7 +1486,7 @@ public:
     // fast convenience methods
     
     
     // fast convenience methods
     
     

-    virtual void DrawRectangleX( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); 
+    virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); 

 
     void SetNativeContext( CGContextRef cg );
 
 
     void SetNativeContext( CGContextRef cg );
 


@@ -1846,8 +1832,8 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
     if (m_composition == wxCOMPOSITION_DEST)
         return true;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return true;
 

-#if wxOSX_USE_COCOA_OR_CARBON
-    if ( UMAGetSystemVersion() < 0x1060 )
+    // TODO REMOVE if we don't need it because of bugs in 10.5
+#if 0

     {
         CGCompositeOperation cop = kCGCompositeOperationSourceOver;
         CGBlendMode mode = kCGBlendModeNormal;
     {
         CGCompositeOperation cop = kCGCompositeOperationSourceOver;
         CGBlendMode mode = kCGBlendModeNormal;


@@ -1886,11 +1872,9 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
         case wxCOMPOSITION_XOR:
             cop = kCGCompositeOperationXOR;
             break;
         case wxCOMPOSITION_XOR:
             cop = kCGCompositeOperationXOR;
             break;

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5

         case wxCOMPOSITION_ADD:
             mode = kCGBlendModePlusLighter ;
             break;
         case wxCOMPOSITION_ADD:
             mode = kCGBlendModePlusLighter ;
             break;

-#endif

         default:
             return false;
         }
         default:
             return false;
         }


@@ -1900,8 +1884,6 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
             CGContextSetBlendMode(m_cgContext, mode);
     }
 #endif
             CGContextSetBlendMode(m_cgContext, mode);
     }
 #endif

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-    else

     {
         CGBlendMode mode = kCGBlendModeNormal;
         switch( op )
     {
         CGBlendMode mode = kCGBlendModeNormal;
         switch( op )


@@ -1937,7 +1919,7 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
            mode = kCGBlendModeDestinationAtop;
             break;
         case wxCOMPOSITION_XOR:
            mode = kCGBlendModeDestinationAtop;
             break;
         case wxCOMPOSITION_XOR:

-            mode = kCGBlendModeXOR;
+            mode = kCGBlendModeExclusion; // Not kCGBlendModeXOR!

             break;
 
         case wxCOMPOSITION_ADD:
             break;
 
         case wxCOMPOSITION_ADD:


@@ -1948,7 +1930,7 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
         }
         CGContextSetBlendMode(m_cgContext, mode);
     }
         }
         CGContextSetBlendMode(m_cgContext, mode);
     }

-#endif
+

     CheckInvariants();
     return true;
 }
     CheckInvariants();
     return true;
 }


@@ -2289,11 +2271,11 @@ void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDoubl
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 

-    CGRect r = CGRectMake( (CGFloat) 0.0 , (CGFloat) 0.0 , (CGFloat) w , (CGFloat) h );

     CGContextSaveGState( m_cgContext );
     CGContextTranslateCTM( m_cgContext,(CGFloat) x ,(CGFloat) (y + h) );
     CGContextScaleCTM( m_cgContext, 1, -1 );
 #if wxOSX_USE_COCOA_OR_CARBON
     CGContextSaveGState( m_cgContext );
     CGContextTranslateCTM( m_cgContext,(CGFloat) x ,(CGFloat) (y + h) );
     CGContextScaleCTM( m_cgContext, 1, -1 );
 #if wxOSX_USE_COCOA_OR_CARBON

+    CGRect r = CGRectMake( (CGFloat) 0.0 , (CGFloat) 0.0 , (CGFloat) w , (CGFloat) h );

     PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone ,
         NULL , kPlotIconRefNormalFlags , icon.GetHICON() );
 #endif
     PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone ,
         NULL , kPlotIconRefNormalFlags , icon.GetHICON() );
 #endif


@@ -2329,7 +2311,6 @@ void wxMacCoreGraphicsContext::DoDrawText( const wxString &str, wxDouble x, wxDo
         return;
 
 #if wxOSX_USE_CORE_TEXT
         return;
 
 #if wxOSX_USE_CORE_TEXT

-    if ( UMAGetSystemVersion() >= 0x1050 )

     {
         wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
         wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
     {
         wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
         wxCFStringRef text(str, wxLocale::GetSystemEncoding() );


@@ -2375,7 +2356,7 @@ void wxMacCoreGraphicsContext::DoDrawText( const wxString &str, wxDouble x, wxDo
         
         CGContextRestoreGState(m_cgContext);
         CGContextSetTextMatrix(m_cgContext, textMatrix);
         
         CGContextRestoreGState(m_cgContext);
         CGContextSetTextMatrix(m_cgContext, textMatrix);

-        CFRelease( col );
+        CGColorRelease( col );

         CheckInvariants();
         return;
     }
         CheckInvariants();
         return;
     }


@@ -2418,7 +2399,6 @@ void wxMacCoreGraphicsContext::DoDrawRotatedText(const wxString &str,
         return;
 
 #if wxOSX_USE_CORE_TEXT
         return;
 
 #if wxOSX_USE_CORE_TEXT

-    if ( UMAGetSystemVersion() >= 0x1050 )

     {
         // default implementation takes care of rotation and calls non rotated DrawText afterwards
         wxGraphicsContext::DoDrawRotatedText( str, x, y, angle );
     {
         // default implementation takes care of rotation and calls non rotated DrawText afterwards
         wxGraphicsContext::DoDrawRotatedText( str, x, y, angle );


@@ -2536,7 +2516,6 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid
         return;
 
 #if wxOSX_USE_CORE_TEXT
         return;
 
 #if wxOSX_USE_CORE_TEXT

-    if ( UMAGetSystemVersion() >= 0x1050 )

     {
         wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
         CTFontRef font = fref->OSXGetCTFont();
     {
         wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
         CTFontRef font = fref->OSXGetCTFont();


@@ -2727,11 +2706,21 @@ void * wxMacCoreGraphicsContext::GetNativeContext()
 }
 
 
 }
 
 

-void wxMacCoreGraphicsContext::DrawRectangleX( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+void wxMacCoreGraphicsContext::DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )

 {
 {

+    if (!EnsureIsValid())
+        return;
+

     if (m_composition == wxCOMPOSITION_DEST) 
         return; 
 
     if (m_composition == wxCOMPOSITION_DEST) 
         return; 
 

+    // when using shading, we have to go back to drawing paths 
+    if ( !m_brush.IsNull() && ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )
+    {
+        wxGraphicsContext::DrawRectangle( x,y,w,h );
+        return;
+    }
+

     CGRect rect = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h );
     if ( !m_brush.IsNull() )
     {
     CGRect rect = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h );
     if ( !m_brush.IsNull() )
     {