remove unneeded code

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 8f815eee528e1a3f4d7285abe7397e5f5d531183..bd03115cb5b455720e7972f23b328349a52c0d3e 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -121,9 +121,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if (!rootwindow)
         return;
 
     if (!rootwindow)
         return;
 

-    int x , y ;
-    x = y = 0 ;
-    window->MacWindowToRootWindow( &x , &y ) ;

     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS
     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS


@@ -149,6 +146,9 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     m_graphicContext->SetBrush( m_brush ) ;
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
 #else
     m_graphicContext->SetBrush( m_brush ) ;
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
 #else

+    int x , y ;
+    x = y = 0 ;
+    window->MacWindowToRootWindow( &x , &y ) ;

     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ;


@@ -252,11 +252,6 @@ wxClientDC::wxClientDC(wxWindow *window) :
     wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;
     wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;

-    wxSize size = window->GetClientSize() ;
-    int x , y ;
-    x = origin.x ;
-    y = origin.y ;
-    window->MacWindowToRootWindow( &x , &y ) ;

     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;


@@ -319,11 +314,6 @@ wxPaintDC::wxPaintDC(wxWindow *window) :
     wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;
     wxWindowDC( window )
 {
     wxPoint origin = window->GetClientAreaOrigin() ;

-    wxSize size = window->GetClientSize() ;
-    int x , y ;
-    x = origin.x ;
-    y = origin.y ;
-    window->MacWindowToRootWindow( &x , &y ) ;

     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;