new graphics context implementation

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index e8ccf9807ac1318b3255d5c346fde618b776477e..10f209b4b0b68cd46375c301eb57fffcbe5ea69f 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -20,7 +20,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
-#ifndef __LP64__
+#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;
+#else
     m_macPort = CreateNewPort() ;
     GrafPtr port ;
     GetPort( &port ) ;
@@ -30,9 +51,7 @@ wxScreenDC::wxScreenDC()
     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 ;
@@ -44,25 +63,21 @@ wxScreenDC::wxScreenDC()
     m_maxX = screenBits.bounds.right  ;
     m_maxY = screenBits.bounds.bottom ;
 
-#if wxMAC_USE_CORE_GRAPHICS
-    m_graphicContext = new wxMacCGContext( port ) ;
-#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
-    m_ok = true ;
-#endif
+       m_ok = true ;
 }
 
 wxScreenDC::~wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
-    delete m_graphicContext ;
-    m_graphicContext = NULL ;
-#endif
-
-#ifndef __LP64__
+    delete m_graphicContext;
+    m_graphicContext = NULL;
+       CGDirectDisplayID display = (CGDirectDisplayID) m_displayId;
+       CGDisplayRelease( display );
+#else
     if ( m_macPort )
         DisposePort( (CGrafPtr) m_macPort ) ;
 #endif