X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7862d3e499501dfc5d6103146cae51f2488c9af..5c7b506103cfc078a821860766e31c47d595e07f:/src/mac/carbon/dcscreen.cpp?ds=sidebyside

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 10f209b4b0..ad8ac0be4a 100644
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -12,73 +12,48 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
+#include "wx/mac/carbon/dcscreen.h"
 
 #include "wx/mac/uma.h"
+#include "wx/graphics.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
+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
-	CGDirectDisplayID display = CGMainDisplayID();
-	m_displayId = (UInt32) display;
-	CGError err = CGDisplayCaptureWithOptions(display,kCGCaptureNoFill);
-	wxASSERT( err == kCGErrorSuccess ); 
-	CGContextRef cg = CGDisplayGetDrawingContext(display);
-	CGRect bounds ;
-    bounds = CGDisplayBounds(display);
-	/*
-    m_macLocalOrigin.x = 0;
-    m_macLocalOrigin.y = 0;
-	*/ // TODO
-    SInt16 height;
-    GetThemeMenuBarHeight( &height );
-    m_minY = height;
-	m_minX = 0;
-    m_maxX = bounds.size.width;
-    m_maxY = bounds.size.height - height;
-    SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );
-	m_width = bounds.size.width;
-	m_height = bounds.size.height - height;
+#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 ;
-
-    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
-	m_ok = true ;
 }
 
-wxScreenDC::~wxScreenDC()
+wxScreenDCImpl::~wxScreenDCImpl()
 {
-#if wxMAC_USE_CORE_GRAPHICS
     delete m_graphicContext;
     m_graphicContext = NULL;
-	CGDirectDisplayID display = (CGDirectDisplayID) m_displayId;
-	CGDisplayRelease( display );
+#ifdef __LP64__
 #else
-    if ( m_macPort )
-        DisposePort( (CGrafPtr) m_macPort ) ;
+    DisposeWindow((WindowRef) m_overlayWindow );
 #endif
 }