X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..33754c4d83c59b7523a6da0c4fb21079cb60301c:/src/mac/carbon/dcclient.cpp diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index 92cb39201b..74533a7442 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -39,7 +39,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) * wxWindowDC */ -#include <wx/mac/uma.h> +#include "wx/mac/uma.h" wxWindowDC::wxWindowDC() { @@ -48,7 +48,7 @@ wxWindowDC::wxWindowDC() wxWindowDC::wxWindowDC(wxWindow *the_canvas) { WindowRef windowref ; - wxWindow* rootwindow ; + wxWindowMac* rootwindow ; // this time it is really the full window @@ -59,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() @@ -78,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 ; @@ -107,13 +106,13 @@ 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 ; + /* wxCoord x , y ,w , h ; window->GetUpdateRegion().GetBox( x , y , w , h ) ; m_minY = m_minX = 0; @@ -121,6 +120,7 @@ wxPaintDC::wxPaintDC(wxWindow *window) m_maxX = size.x ; m_maxY = size.y ; SetClippingRegion( x , y , w , h ) ; + */ SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID)); SetFont(window->GetFont() ) ; }