X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20b6985553b4e01e7960847e3211d940aeff8742..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/dcscreen.cpp diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp index 451f2d7989..ad8ac0be4a 100644 --- a/src/mac/carbon/dcscreen.cpp +++ b/src/mac/carbon/dcscreen.cpp @@ -1,64 +1,59 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcscreen.cpp +// Name: src/mac/carbon/dcscreen.cpp // Purpose: wxScreenDC class // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "dcscreen.h" -#endif - #include "wx/wxprec.h" #include "wx/dcscreen.h" +#include "wx/mac/carbon/dcscreen.h" + #include "wx/mac/uma.h" +#include "wx/graphics.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif +IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl) + +// TODO : for the Screenshot use case, which doesn't work in Quartz +// we should do a GetAsBitmap using something like +// http://www.cocoabuilder.com/archive/message/cocoa/2005/8/13/144256 // Create a DC representing the whole screen -wxScreenDC::wxScreenDC() +wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) : + wxWindowDCImpl( owner ) { -#if wxMAC_USE_CORE_GRAPHICS +#ifdef __LP64__ + m_graphicContext = NULL; + m_ok = false ; #else - m_macPort = CreateNewPort() ; - GrafPtr port ; - GetPort( &port ) ; - SetPort( (GrafPtr) m_macPort ) ; - Point pt = { 0,0 } ; - LocalToGlobal( &pt ) ; - SetPort( port ) ; - m_macLocalOrigin.x = -pt.h ; - m_macLocalOrigin.y = -pt.v ; - - m_ok = TRUE ; - BitMap screenBits; - GetQDGlobalsScreenBits( &screenBits ); - m_minX = screenBits.bounds.left ; - - SInt16 height ; - GetThemeMenuBarHeight( &height ) ; - m_minY = screenBits.bounds.top + height ; - - m_maxX = screenBits.bounds.right ; - m_maxY = screenBits.bounds.bottom ; - MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ; - OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; - CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; + CGRect cgbounds ; + cgbounds = CGDisplayBounds(CGMainDisplayID()); + Rect bounds; + bounds.top = (short)cgbounds.origin.y; + bounds.left = (short)cgbounds.origin.x; + bounds.bottom = bounds.top + (short)cgbounds.size.height; + bounds.right = bounds.left + (short)cgbounds.size.width; + WindowAttributes overlayAttributes = kWindowIgnoreClicksAttribute; + CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow ); + ShowWindow((WindowRef)m_overlayWindow); + SetGraphicsContext( wxGraphicsContext::CreateFromNativeWindow( m_overlayWindow ) ); + m_width = (wxCoord)cgbounds.size.width; + m_height = (wxCoord)cgbounds.size.height; + m_ok = true ; #endif } -wxScreenDC::~wxScreenDC() -{ -#if wxMAC_USE_CORE_GRAPHICS +wxScreenDCImpl::~wxScreenDCImpl() +{ + delete m_graphicContext; + m_graphicContext = NULL; +#ifdef __LP64__ #else - DisposePort( (CGrafPtr) m_macPort ) ; + DisposeWindow((WindowRef) m_overlayWindow ); #endif } -