Merge SOC2009_FSWATCHER branch into trunk.

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

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index df722ea5d90575058171ccf221bd851addc7afc4..94a541d21cfe131f1b876f9df4d0c602cb5a2d1f 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)


@@ -450,12 +450,6 @@ void wxGCDCImpl::SetFont( const wxFont &font )
         if ( f.IsOk() )
             f.SetPointSize( /*LogicalToDeviceYRel*/(font.GetPointSize()));
         m_graphicContext->SetFont( f, m_textForegroundColour );
         if ( f.IsOk() )
             f.SetPointSize( /*LogicalToDeviceYRel*/(font.GetPointSize()));
         m_graphicContext->SetFont( f, m_textForegroundColour );

-#if defined(__WXGTK__) || defined(__WXOSX__)
-        if ( m_font.IsOk() && m_font.GetNoAntiAliasing() ) 
-        {
-            m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
-        }
-#endif

     }
 }
 
     }
 }
 


@@ -499,12 +493,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


@@ -512,7 +506,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;


@@ -851,7 +845,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 )
 {


@@ -871,7 +865,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) )
     {


@@ -880,7 +874,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))
     {


@@ -889,7 +883,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;


@@ -926,7 +920,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);