X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1be0560eff23c7b22cd31783df78266f362b5708..0e05227246cc99b2f8133ae639f38c508351afa0:/src/mac/carbon/dcclient.cpp diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index f28c6dc576..7f14f9b53a 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -9,17 +9,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dcclient.h" -#endif +#include "wx/wxprec.h" #include "wx/dcclient.h" #include "wx/dcmemory.h" #include "wx/region.h" #include "wx/window.h" #include "wx/toplevel.h" -#include +#include "wx/settings.h" +#include "wx/math.h" #include "wx/mac/private.h" +#include "wx/log.h" //----------------------------------------------------------------------------- // constants @@ -31,17 +31,75 @@ // wxPaintDC //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -#endif /* * 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 ) + { + if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) + { + // if we have any other colours in the hierarchy + 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 } ; + int x , y ; + x = y = 0 ; + wxSize size = parent->GetSize() ; + parent->MacClientToRootWindow( &x , &y ) ; + extent.left = x ; + extent.top = y ; + extent.top-- ; + extent.right = x + size.x ; + extent.bottom = y + size.y ; + bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; + break ; + } + + parent = parent->GetParent() ; + } + } + + if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT ) + { + // if we did not find something, use a default + bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; + } +#endif + + return bkdBrush ; +} wxWindowDC::wxWindowDC() { @@ -52,19 +110,49 @@ 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 ) ; + } + else + { + // 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 ; + + m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ; + m_graphicContext->SetPen( m_pen ) ; + m_graphicContext->SetBrush( m_brush ) ; + } + // there is no out-of-order drawing on OSX +#else m_macLocalOrigin.x = x ; m_macLocalOrigin.y = y ; - CopyRgn( (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; + 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 ) ; - m_ok = TRUE ; - SetBackground(window->MacGetBackgroundBrush()); +#endif + SetBackground(MacGetBackgroundBrush(window)); + + SetFont( window->GetFont() ) ; } wxWindowDC::~wxWindowDC() @@ -93,6 +181,7 @@ wxClientDC::wxClientDC(wxWindow *window) wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; if (!rootwindow) return; + WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; wxPoint origin = window->GetClientAreaOrigin() ; wxSize size = window->GetClientSize() ; @@ -100,6 +189,30 @@ wxClientDC::wxClientDC(wxWindow *window) 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 ) ; + } + else + { + // 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 ; + m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ; + m_graphicContext->SetPen( m_pen ) ; + m_graphicContext->SetBrush( m_brush ) ; + } +#else m_macLocalOrigin.x = x ; m_macLocalOrigin.y = y ; SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ; @@ -107,15 +220,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 ) ; +#endif - m_ok = TRUE ; - SetBackground(window->MacGetBackgroundBrush()); + 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 @@ -125,7 +246,6 @@ void wxClientDC::DoGetSize(int *width, int *height) const m_window->GetClientSize( width, height ); } - /* * wxPaintDC */ @@ -146,6 +266,27 @@ wxPaintDC::wxPaintDC(wxWindow *window) 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)); + } + else + { + wxLogDebug(wxT("You cannot create a wxPaintDC outside an OS-draw event") ) ; + m_graphicContext = NULL ; + } + // there is no out-of-order drawing on OSX +#else m_macLocalOrigin.x = x ; m_macLocalOrigin.y = y ; SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ; @@ -154,10 +295,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)); +#endif - m_ok = TRUE ; - SetBackground(window->MacGetBackgroundBrush()); SetFont( window->GetFont() ) ; } @@ -171,5 +311,3 @@ void wxPaintDC::DoGetSize(int *width, int *height) const m_window->GetClientSize( width, height ); } - -