Use "&Help" so wxMac doesn't make an extra help menu

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 1b83a9348a20fc8191f079a6f540f02738af884d..03d769a05b41ddf5987b5ac71122aac8a4e4da83 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcscreen.cpp
 // Purpose:     wxScreenDC class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -24,23 +24,36 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 wxScreenDC::wxScreenDC()
 {
 #if TARGET_CARBON
-       m_macPort = GetQDGlobalsThePort() ;
+    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 ;
 #else
-       m_macPort = LMGetWMgrPort() ;
+    m_macPort = LMGetWMgrPort() ;
+    m_macLocalOrigin.x = 0 ;
+    m_macLocalOrigin.y = 0 ;
 #endif
-       m_ok = TRUE ;
-       BitMap screenBits;
-       GetQDGlobalsScreenBits( &screenBits );
-       m_minX = screenBits.bounds.left ;
+     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 ;
+     SInt16 height ;
+     GetThemeMenuBarHeight( &height ) ;
+     m_minY = screenBits.bounds.top + height ;
  #else
-       m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
+     m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
  #endif
-       m_maxX = screenBits.bounds.right  ;
-       m_maxY = screenBits.bounds.bottom ; 
+    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 ) ;
 }
 
 wxScreenDC::~wxScreenDC()