X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2d123f1421bcc6763d13cb8712a0df01c46134b..2078e2f129c323dd1b01aeef5061f787f8475386:/src/mac/carbon/dcclient.cpp diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index 8f815eee52..63eb7a328e 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -48,70 +48,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) #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 ) ) -#if wxUSE_TAB_DIALOG - || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) -#endif // wxUSE_TAB_DIALOG - ) - { - 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() { m_window = NULL ; + m_release = false; } wxWindowDC::wxWindowDC(wxWindow *window) @@ -121,12 +62,8 @@ wxWindowDC::wxWindowDC(wxWindow *window) if (!rootwindow) return; - int x , y ; - x = y = 0 ; - window->MacWindowToRootWindow( &x , &y ) ; m_ok = true ; -#if wxMAC_USE_CORE_GRAPHICS m_window->GetSize( &m_width , &m_height); CGContextRef cg = (CGContextRef) window->MacGetCGContextRef(); m_release = false; @@ -138,88 +75,76 @@ wxWindowDC::wxWindowDC(wxWindow *window) { CGContextSaveGState( cg ); m_release = true ; - // make sure the context is having its origin at the wx-window coordinates of the + // make sure the context is having its origin at the wx-window coordinates of the // view (read at the top of window.cpp about the differences) if ( window->MacGetLeftBorderSize() != 0 || window->MacGetTopBorderSize() != 0 ) CGContextTranslateCTM( cg , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ); SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) ); } - m_graphicContext->SetPen( m_pen ) ; - m_graphicContext->SetBrush( m_brush ) ; SetClippingRegion( 0 , 0 , m_width , m_height ) ; -#else - m_macLocalOrigin.x = x ; - m_macLocalOrigin.y = y ; - m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ; - - 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 ) ; -#endif - SetBackground(MacGetBackgroundBrush(window)); + + SetBackground(wxBrush(window->GetBackgroundColour(),wxSOLID)); SetFont( window->GetFont() ) ; } wxWindowDC::~wxWindowDC() { -#if wxMAC_USE_CORE_GRAPHICS - if ( m_release && m_graphicContext ) + if ( m_release ) { + // this must not necessarily be the current context, we must restore the state of the + // cg we started with above (before the CGContextTranslateCTM call) CGContextRef cg = (CGContextRef) m_window->MacGetCGContextRef(); CGContextRestoreGState(cg); - //CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ; } -#endif } void wxWindowDC::DoGetSize( int* width, int* height ) const { -#if wxMAC_USE_CORE_GRAPHICS if ( width ) *width = m_width; if ( height ) *height = m_height; -#else - wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); - m_window->GetSize(width, height); -#endif } wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const { - ControlRef handle = (ControlRef) m_window->GetHandle(); + // wxScreenDC is derived from wxWindowDC, so a screen dc will + // call this method when a Blit is performed with it as a source. + if (!m_window) + return wxNullBitmap; + + ControlRef handle = (ControlRef) m_window->GetHandle(); if ( !handle ) return wxNullBitmap; - HIRect rect; + HIRect rect; CGImageRef image; CGContextRef context; void* data; - + size_t bytesPerRow; - + HIViewCreateOffscreenImage( handle, 0, &rect, &image); - - - int width = subrect != NULL ? subrect->width : rect.size.width; - int height = subrect != NULL ? subrect->height : rect.size.height ; - + + + int width = subrect != NULL ? subrect->width : (int)rect.size.width; + int height = subrect != NULL ? subrect->height : (int)rect.size.height ; + bytesPerRow = ( ( width * 8 * 4 + 7 ) / 8 ); data = calloc( 1, bytesPerRow * height ); context = CGBitmapContextCreate( data, width, height, 8, bytesPerRow, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaPremultipliedFirst ); - + if ( subrect ) rect = CGRectOffset( rect, -subrect->x, -subrect->y ) ; CGContextDrawImage( context, rect, image ); - unsigned char* buffer = (unsigned char*) data; + unsigned char* buffer = (unsigned char*) data; wxBitmap bmp = wxBitmap(width, height, 32); wxAlphaPixelData pixData(bmp, wxPoint(0,0), wxSize(width, height)); - - pixData.UseAlpha(); + wxAlphaPixelData::Iterator p(pixData); for (int y=0; yGetClientAreaOrigin() ; - wxSize size = window->GetClientSize() ; - int x , y ; - x = origin.x ; - y = origin.y ; - window->MacWindowToRootWindow( &x , &y ) ; m_window->GetClientSize( &m_width , &m_height); SetDeviceOrigin( origin.x, origin.y ); SetClippingRegion( 0 , 0 , m_width , m_height ) ; } -#else -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 ; - - m_macLocalOrigin.x = x ; - m_macLocalOrigin.y = y ; - SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ; - SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; - 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 ) ; - - SetBackground(MacGetBackgroundBrush(window)); - SetFont( window->GetFont() ) ; -} -#endif wxClientDC::~wxClientDC() { } -#if !wxMAC_USE_CORE_GRAPHICS -void wxClientDC::DoGetSize(int *width, int *height) const -{ - wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); - - m_window->GetClientSize( width, height ); -} -#endif - /* * wxPaintDC */ @@ -314,75 +195,15 @@ wxPaintDC::wxPaintDC() m_window = NULL ; } -#if wxMAC_USE_CORE_GRAPHICS wxPaintDC::wxPaintDC(wxWindow *window) : wxWindowDC( window ) { wxPoint origin = window->GetClientAreaOrigin() ; - wxSize size = window->GetClientSize() ; - int x , y ; - x = origin.x ; - y = origin.y ; - window->MacWindowToRootWindow( &x , &y ) ; m_window->GetClientSize( &m_width , &m_height); SetDeviceOrigin( origin.x, origin.y ); SetClippingRegion( 0 , 0 , m_width , m_height ) ; } -#else -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 - 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 ) ; - SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; - OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ; - 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 ) ; - SetBackground(MacGetBackgroundBrush(window)); -#endif - - SetFont( window->GetFont() ) ; -} -#endif wxPaintDC::~wxPaintDC() { } - -#if !wxMAC_USE_CORE_GRAPHICS -void wxPaintDC::DoGetSize(int *width, int *height) const -{ - wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); - - m_window->GetClientSize( width, height ); -} -#endif