X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11dbb4bfab8f7441e87b34cd094ac6e69438b50a..7f65743f005572f1de2754ba8c5e7cf1eed1847e:/src/mac/carbon/dcscreen.cpp

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index b321bfcfb1..ad8ac0be4a 100644
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -12,54 +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 )
 {
-    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 ;
-#if wxMAC_USE_CORE_GRAPHICS
-    m_macLocalOriginInPort = m_macLocalOrigin ;
-#endif
-    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 ;
-
-#if wxMAC_USE_CORE_GRAPHICS
-    m_graphicContext = new wxMacCGContext( port ) ;
+#ifdef __LP64__
+    m_graphicContext = NULL;
+    m_ok = false ;
 #else
-    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 ) ;
-#endif
+    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()
+wxScreenDCImpl::~wxScreenDCImpl()
 {
-#if wxMAC_USE_CORE_GRAPHICS
-    delete m_graphicContext ;
-    m_graphicContext = NULL ;
+    delete m_graphicContext;
+    m_graphicContext = NULL;
+#ifdef __LP64__
+#else
+    DisposeWindow((WindowRef) m_overlayWindow );
 #endif
-
-    if ( m_macPort )
-        DisposePort( (CGrafPtr) m_macPort ) ;
 }