From 6c0aace267b99d3bc1c107611decca0fd202d5b5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 30 Oct 2006 23:16:17 +0000 Subject: [PATCH] hack to fix warnings about wxMAC_USE_CORE_GRAPHICS_BLEND_MODES not being defined -- but should it be used in this common file at all? git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dcgraph.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index be08d5b29c..4b4461dc3e 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -3,7 +3,7 @@ // Purpose: graphics context methods common to all platforms // Author: Stefan Csomor // Modified by: -// Created: +// Created: // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence @@ -27,6 +27,10 @@ #include "wx/region.h" #endif +#ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES + #define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 +#endif + //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- @@ -58,7 +62,7 @@ wxGCDC::wxGCDC() } void wxGCDC::SetGraphicsContext( wxGraphicsContext* ctx ) -{ +{ delete m_graphicContext; m_graphicContext = ctx; if ( m_graphicContext ) @@ -298,7 +302,7 @@ void wxGCDC::ComputeScaleAndOrigin() m_matrixCurrent.Translate( m_deviceOriginX, m_deviceOriginY ); m_matrixCurrent.Scale( m_scaleX, m_scaleY ); m_matrixCurrent.Translate( m_logicalOriginX, m_logicalOriginY ); - + m_graphicContext->SetTransform( m_matrixOriginal ); m_graphicContext->ConcatTransform( m_matrixCurrent ); } @@ -701,7 +705,7 @@ bool wxGCDC::DoBlit( { wxCHECK_MSG( Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid DC") ); wxCHECK_MSG( source->Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid source DC") ); - + if ( logical_func == wxNO_OP ) return true; else if ( logical_func != wxCOPY ) @@ -718,9 +722,9 @@ bool wxGCDC::DoBlit( wxRect subrect(source-> LogicalToDeviceX(xsrc),source-> LogicalToDeviceY(ysrc), source-> LogicalToDeviceXRel(width),source-> LogicalToDeviceYRel(height)); - + wxBitmap blit = source->GetAsBitmap( &subrect ); - + if ( blit.Ok() ) { m_graphicContext->DrawBitmap( blit, xdest , ydest , width , height ); @@ -837,7 +841,7 @@ void wxGCDC::Clear(void) wxPen p = *wxTRANSPARENT_PEN; m_graphicContext->SetPen( p ); DoDrawRectangle( 0, 0, 32000 , 32000 ); - m_graphicContext->SetPen( m_pen ); + m_graphicContext->SetPen( m_pen ); m_graphicContext->SetBrush( m_brush ); } -- 2.47.2