Explicitly forward non-command events along to the native control first.

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 03d769a05b41ddf5987b5ac71122aac8a4e4da83..4c985b910fbe0b01f09be400e8e7ba78ffde1d0a 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -1,63 +1,77 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
-// 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"
+#include "wx/graphics.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() ;
+#if wxMAC_USE_CORE_GRAPHICS
+    CGRect cgbounds ;
+    cgbounds = CGDisplayBounds(CGMainDisplayID());
+    Rect bounds;
+    bounds.top = (short)cgbounds.origin.y;
+    bounds.left = (short)cgbounds.origin.x;
+    bounds.bottom = bounds.top + (short)cgbounds.size.height;
+    bounds.right = bounds.left  + (short)cgbounds.size.width;
+    WindowAttributes overlayAttributes  = kWindowIgnoreClicksAttribute;
+    CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow );
+    ShowWindow((WindowRef)m_overlayWindow);
+    SetGraphicsContext( wxGraphicsContext::CreateFromNativeWindow( m_overlayWindow ) );
+    m_width = (wxCoord)cgbounds.size.width;
+    m_height = (wxCoord)cgbounds.size.height;
+#else
+    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 ;
-#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_minX = screenBits.bounds.left ;
+
+    SInt16 height ;
+    GetThemeMenuBarHeight( &height ) ;
+    m_minY = screenBits.bounds.top + height ;
+
     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
+    m_ok = true ;
 }
 
 wxScreenDC::~wxScreenDC()
 {
-    // TODO
+#if wxMAC_USE_CORE_GRAPHICS
+    delete m_graphicContext;
+    m_graphicContext = NULL;
+    DisposeWindow((WindowRef) m_overlayWindow );
+#else
+    if ( m_macPort )
+        DisposePort( (CGrafPtr) m_macPort ) ;
+#endif
 }
-