Font (possible) fix

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 437e612a3af3c47a22e28a9507507e96123d3e57..85f092c8f0c485686b87d5635544b21a75ae6381 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -9,23 +9,16 @@
 // 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/mac/uma.h"
 
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.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 TARGET_CARBON

     m_macPort = CreateNewPort() ;
     GrafPtr port ;
     GetPort( &port ) ;
     m_macPort = CreateNewPort() ;
     GrafPtr port ;
     GetPort( &port ) ;


@@ -35,31 +28,38 @@ wxScreenDC::wxScreenDC()
     SetPort( port ) ;
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;
     SetPort( port ) ;
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;

-#else
-    m_macPort = LMGetWMgrPort() ;
-    m_macLocalOrigin.x = 0 ;
-    m_macLocalOrigin.y = 0 ;
+#if wxMAC_USE_CORE_GRAPHICS
+    m_macLocalOriginInPort = m_macLocalOrigin ;

 #endif
 #endif

-     m_ok = TRUE ;

     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
     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_minX = screenBits.bounds.left ;
+
+    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 ;    

 }
 
 wxScreenDC::~wxScreenDC()
 {   
 }
 
 wxScreenDC::~wxScreenDC()
 {   

-    DisposePort( (CGrafPtr) m_macPort ) ;
+#if wxMAC_USE_CORE_GRAPHICS
+    delete m_graphicContext ;
+    m_graphicContext = NULL ;
+#endif
+
+    if ( m_macPort )
+        DisposePort( (CGrafPtr) m_macPort ) ;

 }
 
 }