pen.h depends from brush.h in compat mode

[wxWidgets.git] / src / mac / carbon / dcscreen.cpp

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 32c38ee4edfa4f85af53895d63d6bbbfa1b8e199..ad8ac0be4a413b04a1b2f1dcf5f3358a3558c58d 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -12,65 +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
-       CGRect cgbounds ;
+#ifdef __LP64__
+    m_graphicContext = NULL;
+    m_ok = false ;
+#else
+    CGRect cgbounds ;
     cgbounds = CGDisplayBounds(CGMainDisplayID());
-       Rect bounds;
-       bounds.top = cgbounds.origin.y;
-       bounds.left = cgbounds.origin.x;
-       bounds.bottom = bounds.top + cgbounds.size.height;
-       bounds.right = bounds.left  + cgbounds.size.width;
+    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;
-       OSStatus err = CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow );               
-       ShowWindow((WindowRef)m_overlayWindow);
+    CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow );
+    ShowWindow((WindowRef)m_overlayWindow);
     SetGraphicsContext( wxGraphicsContext::CreateFromNativeWindow( m_overlayWindow ) );
-       m_width = cgbounds.size.width;
-       m_height = cgbounds.size.height;
-#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 ) ;
+    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;
-       DisposeWindow((WindowRef) m_overlayWindow );
+    delete m_graphicContext;
+    m_graphicContext = NULL;
+#ifdef __LP64__
 #else
-    if ( m_macPort )
-        DisposePort( (CGrafPtr) m_macPort ) ;
+    DisposeWindow((WindowRef) m_overlayWindow );
 #endif
 }