Make wxPORTRAIT and wxLANDSCAPE elements of wxPrintOrientation enum.

[wxWidgets.git] / src / common / dcgraph.cpp

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 9e5e2b81fdb9ca010975a06536fe490038278ec4..ee399d4907dee76ead9780cd82fd4e34ca6f53ca 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -72,7 +72,7 @@ static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode
         case wxXOR:        // src XOR dst
             *op = wxCOMPOSITION_XOR;
             break;
         case wxXOR:        // src XOR dst
             *op = wxCOMPOSITION_XOR;
             break;

-            
+

         case wxAND:        // src AND dst
         case wxAND_INVERT: // (NOT src) AND dst
         case wxAND_REVERSE:// src AND (NOT dst)
         case wxAND:        // src AND dst
         case wxAND_INVERT: // (NOT src) AND dst
         case wxAND_REVERSE:// src AND (NOT dst)


@@ -172,7 +172,15 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ) :
    wxDCImpl( owner )
 {
     Init();
    wxDCImpl( owner )
 {
     Init();

-    SetGraphicsContext( wxGraphicsContext::Create(dc) );
+    wxGraphicsContext* context;
+#if wxUSE_CAIRO
+    wxGraphicsRenderer* renderer = wxGraphicsRenderer::GetCairoRenderer();
+    context = renderer->CreateContext(dc);
+#else
+    context = wxGraphicsContext::Create(dc);
+#endif
+
+    SetGraphicsContext( context );

 }
 
 #if wxUSE_PRINTING_ARCHITECTURE
 }
 
 #if wxUSE_PRINTING_ARCHITECTURE


@@ -265,9 +273,7 @@ void wxGCDCImpl::EndPage()
 
 void wxGCDCImpl::Flush()
 {
 
 void wxGCDCImpl::Flush()
 {

-#ifdef __WXOSX_OR_COCOA__
-    CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() );
-#endif
+    m_graphicContext->Flush();

 }
 
 void wxGCDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
 }
 
 void wxGCDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )


@@ -493,12 +499,12 @@ void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function )
         return;
 
     m_logicalFunction = function;
         return;
 
     m_logicalFunction = function;

-    
+

     wxCompositionMode mode;
     m_logicalFunctionSupported = TranslateRasterOp( function, &mode);
     if (m_logicalFunctionSupported)
         m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode);
     wxCompositionMode mode;
     m_logicalFunctionSupported = TranslateRasterOp( function, &mode);
     if (m_logicalFunctionSupported)
         m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode);

-        
+

     if (mode == wxCOMPOSITION_XOR)
         m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
     else
     if (mode == wxCOMPOSITION_XOR)
         m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
     else


@@ -506,7 +512,7 @@ void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function )
 }
 
 bool wxGCDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
 }
 
 bool wxGCDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),

-                             const wxColour& WXUNUSED(col), 
+                             const wxColour& WXUNUSED(col),

                              wxFloodFillStyle WXUNUSED(style))
 {
     return false;
                              wxFloodFillStyle WXUNUSED(style))
 {
     return false;


@@ -845,7 +851,7 @@ bool wxGCDCImpl::CanDrawBitmap() const
 
 bool wxGCDCImpl::DoBlit(
     wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 
 bool wxGCDCImpl::DoBlit(
     wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-    wxDC *source, wxCoord xsrc, wxCoord ysrc, 
+    wxDC *source, wxCoord xsrc, wxCoord ysrc,

     wxRasterOperationMode logical_func , bool useMask,
     wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxRasterOperationMode logical_func , bool useMask,
     wxCoord xsrcMask, wxCoord ysrcMask )
 {


@@ -865,7 +871,7 @@ bool wxGCDCImpl::DoStretchBlit(
 
     if ( logical_func == wxNO_OP )
         return true;
 
     if ( logical_func == wxNO_OP )
         return true;

-        
+

     wxCompositionMode mode;
     if ( !TranslateRasterOp(logical_func, &mode) )
     {
     wxCompositionMode mode;
     if ( !TranslateRasterOp(logical_func, &mode) )
     {


@@ -874,7 +880,7 @@ bool wxGCDCImpl::DoStretchBlit(
     }
 
     bool retval = true;
     }
 
     bool retval = true;

-    
+

     wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
     if (m_graphicContext->SetCompositionMode(mode))
     {
     wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
     if (m_graphicContext->SetCompositionMode(mode))
     {


@@ -883,7 +889,7 @@ bool wxGCDCImpl::DoStretchBlit(
         {
             m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
         }
         {
             m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
         }

-            
+

         if (xsrcMask == -1 && ysrcMask == -1)
         {
             xsrcMask = xsrc;
         if (xsrcMask == -1 && ysrcMask == -1)
         {
             xsrcMask = xsrc;


@@ -920,7 +926,7 @@ bool wxGCDCImpl::DoStretchBlit(
             wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") );
             retval = false;
         }
             wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") );
             retval = false;
         }

-        
+

         if (mode == wxCOMPOSITION_XOR)
         {
             m_graphicContext->SetAntialiasMode(formerAa);
         if (mode == wxCOMPOSITION_XOR)
         {
             m_graphicContext->SetAntialiasMode(formerAa);