Merge new item attributes if any are already existing

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 451f2d7989e6705d226f3734721141c7333746cf..e8ccf9807ac1318b3255d5c346fde618b776477e 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -1,64 +1,69 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.cpp
+// Name:        src/mac/carbon/dcscreen.cpp

 // Purpose:     wxScreenDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxScreenDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcscreen.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"

+

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)

-#endif

 
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
 
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {

-#if wxMAC_USE_CORE_GRAPHICS
-#else
+#ifndef __LP64__

     m_macPort = CreateNewPort() ;
     GrafPtr port ;
     GetPort( &port ) ;
     SetPort( (GrafPtr) m_macPort ) ;
     Point pt = { 0,0 } ;
     m_macPort = CreateNewPort() ;
     GrafPtr port ;
     GetPort( &port ) ;
     SetPort( (GrafPtr) m_macPort ) ;
     Point pt = { 0,0 } ;

-    LocalToGlobal( &pt ) ;     
+    LocalToGlobal( &pt ) ;

     SetPort( port ) ;
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;
     SetPort( port ) ;
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;

-
-     m_ok = TRUE ;
+#if wxMAC_USE_CORE_GRAPHICS
+    m_macLocalOriginInPort = m_macLocalOrigin ;
+#endif

     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );

-     m_minX = screenBits.bounds.left ;
+    m_minX = screenBits.bounds.left ;

 
 

-     SInt16 height ;
-     GetThemeMenuBarHeight( &height ) ;
-     m_minY = screenBits.bounds.top + height ;
+    SInt16 height ;
+    GetThemeMenuBarHeight( &height ) ;
+    m_minY = screenBits.bounds.top + height ;

 
     m_maxX = screenBits.bounds.right  ;
     m_maxY = screenBits.bounds.bottom ;
 
     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 ) ;
     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
 }
 
 wxScreenDC::~wxScreenDC()
 #endif
 }
 
 wxScreenDC::~wxScreenDC()

-{   
+{

 #if wxMAC_USE_CORE_GRAPHICS
 #if wxMAC_USE_CORE_GRAPHICS

-#else
-    DisposePort( (CGrafPtr) m_macPort ) ;
+    delete m_graphicContext ;
+    m_graphicContext = NULL ;

 #endif
 #endif

-}

 
 

+#ifndef __LP64__
+    if ( m_macPort )
+        DisposePort( (CGrafPtr) m_macPort ) ;
+#endif
+}