Remove old/new DC test code (3000th commit - and still typing)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index c8ee27bd35469dd87619891a8e732da948ecb254..4a36650e9ed599a5c3d2e0f56ea4785e7edd7637 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1439,17 +1439,16 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
         else
         {
             // No scaling and not a memory dc with a mask either
         else
         {
             // No scaling and not a memory dc with a mask either

-#if wxUSE_NEW_DC

             GdkWindow* window = NULL;
             wxDCImpl *impl = source->GetImpl();
             wxWindowDCImpl *gtk_impl = wxDynamicCast(impl, wxWindowDCImpl);
             if (gtk_impl)
                 window = gtk_impl->GetGDKWindow();
             GdkWindow* window = NULL;
             wxDCImpl *impl = source->GetImpl();
             wxWindowDCImpl *gtk_impl = wxDynamicCast(impl, wxWindowDCImpl);
             if (gtk_impl)
                 window = gtk_impl->GetGDKWindow();

-#else            
-            GdkWindow* window = source->GetGDKWindow();
-#endif

             if ( !window )
             if ( !window )

+            {
+                SetLogicalFunction( old_logical_func );

                 return false;
                 return false;

+            }

 
             // copy including child window contents
             gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
 
             // copy including child window contents
             gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );