X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..d9f9aa2d8fcb956444588b2c19ffe8d4a3f5d2bb:/src/mac/dcclient.cpp

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 08aeff0504..8d97ce4889 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>
 
 //-----------------------------------------------------------------------------
@@ -40,11 +41,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 
 #include <wx/mac/uma.h>
 
-wxWindowDC::wxWindowDC(void)
+wxWindowDC::wxWindowDC() 
 {
 }
 
-wxWindowDC::wxWindowDC(wxWindow *the_canvas)
+wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
 	WindowRef windowref ;
 	wxWindow* rootwindow ;
@@ -53,11 +54,16 @@ wxWindowDC::wxWindowDC(wxWindow *the_canvas)
 	
 	the_canvas->MacGetPortParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
 	m_macPort = UMAGetWindowPort( windowref ) ;
-	MacSetupPort() ;
+	m_minY = m_minX =  0;
+	wxSize size = the_canvas->GetSize() ;
+	m_maxX = size.x  ;
+	m_maxY = size.y ; 
+
  	m_ok = TRUE ;
+  SetBackground(wxBrush(the_canvas->GetBackgroundColour(), wxSOLID));
 }
 
-wxWindowDC::~wxWindowDC(void)
+wxWindowDC::~wxWindowDC()
 {
 }
 
@@ -65,7 +71,7 @@ wxWindowDC::~wxWindowDC(void)
  * wxClientDC
  */
 
-wxClientDC::wxClientDC(void)
+wxClientDC::wxClientDC()
 {
 }
 
@@ -76,13 +82,16 @@ wxClientDC::wxClientDC(wxWindow *window)
 	
 	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  ;
+	m_maxY = size.y ; 
  	m_ok = TRUE ;
-  SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
-
+  	SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
+	SetFont( window->GetFont() ) ;
 }
 
-wxClientDC::~wxClientDC(void)
+wxClientDC::~wxClientDC()
 {
 }
 
@@ -90,7 +99,7 @@ wxClientDC::~wxClientDC(void)
  * wxPaintDC
  */
 
-wxPaintDC::wxPaintDC(void)
+wxPaintDC::wxPaintDC()
 {
 }
 
@@ -102,12 +111,18 @@ wxPaintDC::wxPaintDC(wxWindow *window)
 	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() ) ;
 }
 
 wxPaintDC::~wxPaintDC()