X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e928c28c89ae7ed825eb9826ccdbf9337eb85072..f61ed7ee42d7647663e48ac55062be0935bb07aa:/src/mac/carbon/dcclient.cpp diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index f256b6b4ee..24e5d95e30 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -1,21 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.cpp +// Name: src/mac/carbon/dcclient.cpp // Purpose: wxClientDC class // Author: Stefan Csomor // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "dcclient.h" -#endif - #include "wx/wxprec.h" #include "wx/dcclient.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" +#endif + #include "wx/dcmemory.h" #include "wx/region.h" #include "wx/window.h" @@ -23,7 +24,6 @@ #include "wx/settings.h" #include "wx/math.h" #include "wx/mac/private.h" -#include "wx/log.h" //----------------------------------------------------------------------------- // constants @@ -35,11 +35,9 @@ // wxPaintDC //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -#endif /* * wxWindowDC @@ -48,19 +46,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) #include "wx/mac/uma.h" #include "wx/notebook.h" #include "wx/tabctrl.h" - + static wxBrush MacGetBackgroundBrush( wxWindow* window ) { wxBrush bkdBrush = window->MacGetBackgroundBrush() ; + #if !TARGET_API_MAC_OSX // transparency cannot be handled by the OS when not using composited windows wxWindow* parent = window->GetParent() ; + // if we have some 'pseudo' transparency if ( ! bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT || window->GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) { // walk up until we find something - while( parent != NULL ) + while ( parent != NULL ) { if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) { @@ -68,11 +68,13 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window ) bkdBrush.SetColour( parent->GetBackgroundColour() ) ; break ; } + if ( parent->IsKindOf( CLASSINFO(wxTopLevelWindow) ) ) { bkdBrush = parent->MacGetBackgroundBrush() ; break ; } + if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) ) { Rect extent = { 0 , 0 , 0 , 0 } ; @@ -85,75 +87,75 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window ) extent.top-- ; extent.right = x + size.x ; extent.bottom = y + size.y ; - bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; + bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; break ; } - - parent = parent->GetParent() ; + + parent = parent->GetParent() ; } } + if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT ) { // if we did not find something, use a default bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; } -#endif - return bkdBrush ; -} +#endif + return bkdBrush ; +} -wxWindowDC::wxWindowDC() +wxWindowDC::wxWindowDC() { m_window = NULL ; } -wxWindowDC::wxWindowDC(wxWindow *window) +wxWindowDC::wxWindowDC(wxWindow *window) { m_window = window ; + wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; + if (!rootwindow) + return; + + WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; + int x , y ; + x = y = 0 ; + wxSize size = window->GetSize() ; + window->MacWindowToRootWindow( &x , &y ) ; + m_macPort = UMAGetWindowPort( windowref ) ; + m_ok = true ; + #if wxMAC_USE_CORE_GRAPHICS + m_macLocalOriginInPort.x = x ; + m_macLocalOriginInPort.y = y ; + if ( window->MacGetCGContextRef() ) { m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ; m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; - SetBackground(MacGetBackgroundBrush(window)); } else { // as out of order redraw is not supported under CQ, we have to create a qd port for these // situations - wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; - if (!rootwindow) - return; - WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; - int x , y ; - x = y = 0 ; - window->MacWindowToRootWindow( &x , &y ) ; m_macLocalOrigin.x = x ; m_macLocalOrigin.y = y ; - CGrafPtr port = UMAGetWindowPort( windowref ) ; - - m_graphicContext = new wxMacCGContext( port ) ; + + m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ; m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; - SetBackground(MacGetBackgroundBrush(window)); } // there is no out-of-order drawing on OSX #else - wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; - WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; - int x , y ; - x = y = 0 ; - window->MacWindowToRootWindow( &x , &y ) ; m_macLocalOrigin.x = x ; m_macLocalOrigin.y = y ; CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - m_macPort = UMAGetWindowPort( windowref ) ; - SetBackground(MacGetBackgroundBrush(window)); #endif - m_ok = TRUE ; + SetBackground(MacGetBackgroundBrush(window)); + SetFont( window->GetFont() ) ; } @@ -180,49 +182,41 @@ wxClientDC::wxClientDC() wxClientDC::wxClientDC(wxWindow *window) { m_window = window ; + wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; + if (!rootwindow) + return; + + WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; + wxPoint origin = window->GetClientAreaOrigin() ; + wxSize size = window->GetClientSize() ; + int x , y ; + x = origin.x ; + y = origin.y ; + window->MacWindowToRootWindow( &x , &y ) ; + m_macPort = UMAGetWindowPort( windowref ) ; + m_ok = true ; + #if wxMAC_USE_CORE_GRAPHICS - m_graphicContext = NULL ; + m_macLocalOriginInPort.x = x ; + m_macLocalOriginInPort.y = y ; if ( window->MacGetCGContextRef() ) { m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ; m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; - SetBackground(MacGetBackgroundBrush(window)); + SetClippingRegion( 0 , 0 , size.x , size.y ) ; } else { - // as out of order redraw is not supported under CQ, we have to create a qd port for these - // situations - wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; - if (!rootwindow) - return; - WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; - wxPoint origin = window->GetClientAreaOrigin() ; - int x , y ; - x = origin.x ; - y = origin.y ; - window->MacWindowToRootWindow( &x , &y ) ; + // as out of order redraw is not supported under CQ, + // we have to create a QD port for these situations m_macLocalOrigin.x = x ; m_macLocalOrigin.y = y ; - CGrafPtr port = UMAGetWindowPort( windowref ) ; - - m_graphicContext = new wxMacCGContext( port ) ; + m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ; m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; - SetBackground(MacGetBackgroundBrush(window)); } - m_ok = TRUE ; #else - wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; - if (!rootwindow) - return; - WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; - wxPoint origin = window->GetClientAreaOrigin() ; - wxSize size = window->GetClientSize() ; - int x , y ; - x = origin.x ; - y = origin.y ; - window->MacWindowToRootWindow( &x , &y ) ; m_macLocalOrigin.x = x ; m_macLocalOrigin.y = y ; SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ; @@ -230,15 +224,23 @@ wxClientDC::wxClientDC(wxWindow *window) OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ; - m_macPort = UMAGetWindowPort( windowref ) ; - m_ok = TRUE ; #endif + SetBackground(MacGetBackgroundBrush(window)); SetFont( window->GetFont() ) ; } wxClientDC::~wxClientDC() { +#if wxMAC_USE_CORE_GRAPHICS +/* + if ( m_window->MacGetCGContextRef() == 0) + { + CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; + CGContextFlush( cgContext ) ; + } +*/ +#endif } void wxClientDC::DoGetSize(int *width, int *height) const @@ -248,7 +250,6 @@ void wxClientDC::DoGetSize(int *width, int *height) const m_window->GetClientSize( width, height ); } - /* * wxPaintDC */ @@ -261,31 +262,35 @@ wxPaintDC::wxPaintDC() wxPaintDC::wxPaintDC(wxWindow *window) { m_window = window ; + wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; + WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; + wxPoint origin = window->GetClientAreaOrigin() ; + wxSize size = window->GetClientSize() ; + int x , y ; + x = origin.x ; + y = origin.y ; + window->MacWindowToRootWindow( &x , &y ) ; + m_macPort = UMAGetWindowPort( windowref ) ; + m_ok = true ; + #if wxMAC_USE_CORE_GRAPHICS + m_macLocalOriginInPort.x = x ; + m_macLocalOriginInPort.y = y ; if ( window->MacGetCGContextRef() ) { m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ; m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; + SetClippingRegion( 0 , 0 , size.x , size.y ) ; SetBackground(MacGetBackgroundBrush(window)); - m_ok = TRUE ; } else { wxLogDebug(wxT("You cannot create a wxPaintDC outside an OS-draw event") ) ; m_graphicContext = NULL ; - m_ok = TRUE ; } // there is no out-of-order drawing on OSX #else - wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; - WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; - wxPoint origin = window->GetClientAreaOrigin() ; - wxSize size = window->GetClientSize() ; - int x , y ; - x = origin.x ; - y = origin.y ; - window->MacWindowToRootWindow( &x , &y ) ; m_macLocalOrigin.x = x ; m_macLocalOrigin.y = y ; SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ; @@ -294,10 +299,9 @@ wxPaintDC::wxPaintDC(wxWindow *window) SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->GetUpdateRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - m_macPort = UMAGetWindowPort( windowref ) ; SetBackground(MacGetBackgroundBrush(window)); - m_ok = TRUE ; #endif + SetFont( window->GetFont() ) ; } @@ -311,5 +315,3 @@ void wxPaintDC::DoGetSize(int *width, int *height) const m_window->GetClientSize( width, height ); } - -