warnin - move pict to where it belongs :)

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index f700c6466879df06cc8bd76d8225dc80bee0ccf7..451f2d7989e6705d226f3734721141c7333746cf 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -6,13 +6,15 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWidgets licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcscreen.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/dcscreen.h"
 #include "wx/mac/uma.h"
 
@@ -23,8 +25,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
-#if TARGET_CARBON
-    m_macPort = GetQDGlobalsThePort() ;
+#if wxMAC_USE_CORE_GRAPHICS
+#else
+    m_macPort = CreateNewPort() ;
     GrafPtr port ;
     GetPort( &port ) ;
     SetPort( (GrafPtr) m_macPort ) ;
@@ -33,31 +36,29 @@ wxScreenDC::wxScreenDC()
     SetPort( port ) ;
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;
-#else
-    m_macPort = LMGetWMgrPort() ;
-    m_macLocalOrigin.x = 0 ;
-    m_macLocalOrigin.y = 0 ;
-#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 ) ;
+#endif
 }
 
 wxScreenDC::~wxScreenDC()
-{
-    // TODO
+{   
+#if wxMAC_USE_CORE_GRAPHICS
+#else
+    DisposePort( (CGrafPtr) m_macPort ) ;
+#endif
 }