Fix for non-CG mode

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 32c38ee4edfa4f85af53895d63d6bbbfa1b8e199..07e8218b4b49525df178ba071ad76191825bd4f6 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -14,6 +14,7 @@
 #include "wx/dcscreen.h"
 
 #include "wx/mac/uma.h"
+#include "wx/graphics.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 
@@ -21,19 +22,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 wxScreenDC::wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
-       CGRect cgbounds ;
+    CGRect cgbounds ;
     cgbounds = CGDisplayBounds(CGMainDisplayID());
-       Rect bounds;
-       bounds.top = cgbounds.origin.y;
-       bounds.left = cgbounds.origin.x;
-       bounds.bottom = bounds.top + cgbounds.size.height;
-       bounds.right = bounds.left  + cgbounds.size.width;
+    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;
-       OSStatus err = CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow );               
-       ShowWindow((WindowRef)m_overlayWindow);
+    CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow );
+    ShowWindow((WindowRef)m_overlayWindow);
     SetGraphicsContext( wxGraphicsContext::CreateFromNativeWindow( m_overlayWindow ) );
-       m_width = cgbounds.size.width;
-       m_height = cgbounds.size.height;
+    m_width = (wxCoord)cgbounds.size.width;
+    m_height = (wxCoord)cgbounds.size.height;
 #else
     m_macPort = CreateNewPort() ;
     GrafPtr port ;
@@ -42,8 +43,8 @@ wxScreenDC::wxScreenDC()
     Point pt = { 0,0 } ;
     LocalToGlobal( &pt ) ;
     SetPort( port ) ;
-    m_macLocalOrigin.x = -pt.h ;
-    m_macLocalOrigin.y = -pt.v ;
+    m_deviceLocalOriginX = -pt.h ;
+    m_deviceLocalOriginY = -pt.v ;
 
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
@@ -57,18 +58,18 @@ wxScreenDC::wxScreenDC()
     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 ) ;
+    OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_deviceLocalOriginX , m_deviceLocalOriginY ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 #endif
-       m_ok = true ;
+    m_ok = true ;
 }
 
 wxScreenDC::~wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
-       delete m_graphicContext;
-       m_graphicContext = NULL;
-       DisposeWindow((WindowRef) m_overlayWindow );
+    delete m_graphicContext;
+    m_graphicContext = NULL;
+    DisposeWindow((WindowRef) m_overlayWindow );
 #else
     if ( m_macPort )
         DisposePort( (CGrafPtr) m_macPort ) ;