From 64c8307c93601b867d0d9557e4f25ca54ae6073b Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 29 Oct 2006 11:07:11 +0000
Subject: [PATCH] blit implemented using dc.GetAsBitmap with subrect

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/dcgraph.cpp | 58 ++++--------------------------------------
 1 file changed, 5 insertions(+), 53 deletions(-)

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index de8f07b3fb..e0ff46275c 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -714,59 +714,11 @@ bool wxGCDC::DoBlit(
         ysrcMask = ysrc;
     }
 
-    wxCoord yysrc = source-> LogicalToDeviceY(ysrc);
-    wxCoord xxsrc = source-> LogicalToDeviceX(xsrc);
-    wxCoord wwsrc = source-> LogicalToDeviceXRel(width);
-    wxCoord hhsrc = source-> LogicalToDeviceYRel(height);
-
-    wxBitmap blit;
-    wxMemoryDC* memdc = wxDynamicCast(source,wxMemoryDC);
-    if ( memdc )
-    {
-        blit = memdc->GetSelectedBitmap();
-
-        wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") );
-
-        wxCoord bmpwidth = blit.GetWidth();
-        wxCoord bmpheight = blit.GetHeight();
-
-        if ( xxsrc != 0 || yysrc != 0 || bmpwidth != wwsrc || bmpheight != hhsrc )
-        {
-            wwsrc = wxMin( wwsrc , bmpwidth - xxsrc );
-            hhsrc = wxMin( hhsrc , bmpheight - yysrc );
-            if ( wwsrc > 0 && hhsrc > 0 )
-            {
-                if ( xxsrc >= 0 && yysrc >= 0 )
-                {
-                    wxRect subrect( xxsrc, yysrc, wwsrc , hhsrc );
-                    // TODO we perhaps could add a DrawSubBitmap call to dc for performance reasons
-                    blit = blit.GetSubBitmap( subrect );
-                }
-                else
-                {
-                    // in this case we'd probably have to adjust the different coordinates, but
-                    // we have to find out proper contract first
-                    blit = wxNullBitmap;
-                }
-            }
-            else
-            {
-                blit = wxNullBitmap;
-            }
-        }
-    }
-    else
-    {  
-        wxWindowDC* windc = wxDynamicCast(source,wxWindowDC);
-        if (windc)
-        {   
-            wxBitmap bmp;
-            bmp = windc->GetAsBitmap();
-            if (bmp.IsOk())
-                blit = bmp.GetSubBitmap( wxRect(xsrc, ysrc, width, height ) ); 
-        }
-    }
-    
+    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 );
-- 
2.45.2