X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..33754c4d83c59b7523a6da0c4fb21079cb60301c:/src/mac/dcclient.cpp?ds=sidebyside

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 6f3a6b3517..74533a7442 100644
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -16,6 +16,7 @@
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
+#include "wx/window.h"
 #include <math.h>
 
 //-----------------------------------------------------------------------------
@@ -38,7 +39,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
  * wxWindowDC
  */
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 wxWindowDC::wxWindowDC() 
 {
@@ -47,7 +48,7 @@ wxWindowDC::wxWindowDC()
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
 	WindowRef windowref ;
-	wxWindow* rootwindow ;
+	wxWindowMac* rootwindow ;
 	
 	// this time it is really the full window
 	
@@ -58,8 +59,8 @@ wxWindowDC::wxWindowDC(wxWindow *the_canvas)
 	m_maxX = size.x  ;
 	m_maxY = size.y ; 
 
-	MacSetupPort() ;
  	m_ok = TRUE ;
+  SetBackground(wxBrush(the_canvas->GetBackgroundColour(), wxSOLID));
 }
 
 wxWindowDC::~wxWindowDC()
@@ -77,11 +78,10 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
 	WindowRef windowref ;
-	wxWindow* rootwindow ;
+	wxWindowMac* rootwindow ;
 	
 	window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
 	m_macPort = UMAGetWindowPort( windowref ) ;
-	MacSetupPort() ;
 	m_minY = m_minX =  0;
 	wxSize size = window->GetSize() ;
 	m_maxX = size.x  ;
@@ -106,20 +106,21 @@ wxPaintDC::wxPaintDC()
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
 	WindowRef windowref ;
-	wxWindow* rootwindow ;
+	wxWindowMac* rootwindow ;
 	
 	window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
 
 	m_macPort = UMAGetWindowPort( windowref ) ;
-	MacSetupPort() ;
  	m_ok = TRUE ;
-	long x , y ,w , h ;
+	/*
+	wxCoord x , y ,w , h ;
 	window->GetUpdateRegion().GetBox( x , y , w , h ) ;
 	m_minY = m_minX =  0;
 	wxSize size = window->GetSize() ;
 	m_maxX = size.x  ;
 	m_maxY = size.y ; 
 	SetClippingRegion( x , y , w , h ) ;
+  	*/
   	SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
   	SetFont(window->GetFont() ) ;
 }