correction to maintain data array in synch with string array

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

diff --git a/src/mac/dcscreen.cpp b/src/mac/dcscreen.cpp
index 1ea12f3d29c45024a2ef8e5d73f94163ebfbf70c..c47126248e7ab604fd8899f72bedb5a242004294 100644 (file)
--- a/src/mac/dcscreen.cpp
+++ b/src/mac/dcscreen.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/dcscreen.h"
 #endif
 
 #include "wx/dcscreen.h"

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

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)


@@ -22,9 +23,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 {

+#if TARGET_CARBON
+       m_macPort = GetQDGlobalsThePort() ;
+#else

        m_macPort = LMGetWMgrPort() ;
        m_macPort = LMGetWMgrPort() ;

+#endif

        MacSetupPort() ;
        m_ok = TRUE ;
        MacSetupPort() ;
        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 ; 

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