Don't force ColWidth to always grow for wxGridCellAutoWrapStringRenderer (#1798)

[wxWidgets.git] / src / generic / graphicc.cpp

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 70debbac5e7ea68a5f464f202eaebb67f604c7f7..08b92ef8c7d8f3bb1559ffb3ba41d9efcfcd669f 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -107,7 +107,7 @@ static inline double RadToDeg(double deg)
 #endif
 
 #ifdef __WXMAC__
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #include <cairo-quartz.h>
 #include <cairo-atsui.h>
 #endif
@@ -1042,22 +1042,15 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC&
     const wxDCImpl *impl = dc.GetImpl();
     Init( (cairo_t*) impl->GetCairoContext() );
 
-#if 0 
-    wxGraphicsMatrix matrix = CreateMatrix();
-    
     wxPoint org = dc.GetDeviceOrigin();
-    matrix.Translate( org.x, org.y );
+    cairo_translate( m_context, org.x, org.y );
     
-    org = dc.GetLogicalOrigin();
-    matrix.Translate( -org.x, -org.y );
-
     double sx,sy;
     dc.GetUserScale( &sx, &sy );
-    matrix.Scale( sx, sy );
-
-    ConcatTransform( matrix );
-#endif
+    cairo_scale( m_context, sx, sy );
 
+    org = dc.GetLogicalOrigin();
+    cairo_translate( m_context, -org.x, -org.y );
 #endif
 }