X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a67a93b17c37c018f60e662645ee2a44ba4e58e..ef70f0ecdbc4268923e132b257c95e8a2525f4ca:/src/mac/dcclient.cpp?ds=sidebyside diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp index ef0d666568..99ee68a0fb 100644 --- a/src/mac/dcclient.cpp +++ b/src/mac/dcclient.cpp @@ -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,7 +59,6 @@ wxWindowDC::wxWindowDC(wxWindow *the_canvas) m_maxX = size.x ; m_maxY = size.y ; - MacSetupPort() ; m_ok = TRUE ; SetBackground(wxBrush(the_canvas->GetBackgroundColour(), wxSOLID)); } @@ -79,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 ; @@ -108,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; @@ -122,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() ) ; }