renamed RGBColor setter to avoid former overload being an override

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 0e12102f6f5dfbd0a2fe3bd1b96a298968041992..85f092c8f0c485686b87d5635544b21a75ae6381 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -6,58 +6,60 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dcscreen.h"
-#endif
+#include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
-#endif
 
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
-#if TARGET_CARBON
-       m_macPort = GetQDGlobalsThePort() ;
-       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_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 ) ;    
 #else
-       m_macPort = LMGetWMgrPort() ;
-       m_macLocalOrigin.x = 0 ;
-       m_macLocalOrigin.y = 0 ;
+    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 ;
-       BitMap screenBits;
-       GetQDGlobalsScreenBits( &screenBits );
-       m_minX = screenBits.bounds.left ;
- #if TARGET_CARBON
-       SInt16 height ;
-       GetThemeMenuBarHeight( &height ) ;
-       m_minY = screenBits.bounds.top + height ;
- #else
-       m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
- #endif
-       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_ok = TRUE ;    
 }
 
 wxScreenDC::~wxScreenDC()
-{
-    // TODO
+{   
+#if wxMAC_USE_CORE_GRAPHICS
+    delete m_graphicContext ;
+    m_graphicContext = NULL ;
+#endif
+
+    if ( m_macPort )
+        DisposePort( (CGrafPtr) m_macPort ) ;
 }