Finally fixed control scrolling

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index a19dc36477a03e1157c1ee9bb04633e9c703436c..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/dcscreen.h"
 
 #include "wx/mac/uma.h"

+#include "wx/graphics.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 


@@ -21,26 +22,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 wxScreenDC::wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
 wxScreenDC::wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS

-       CGrafPtr grafptr = CreateNewPort() ;
-       m_displayId = (UInt32) grafptr;
-       CGContextRef cg = NULL;
-       OSStatus status = QDBeginCGContext( grafptr , &cg );
-
-       CGRect bounds ;
-    bounds = CGDisplayBounds(CGMainDisplayID());
-
-    SInt16 height;
-    GetThemeMenuBarHeight( &height );
-    m_minY = height;
-       m_minX = 0;
-    m_maxX = bounds.size.width;
-    m_maxY = bounds.size.height - height;
-       CGContextTranslateCTM( cg , 0 , bounds.size.height );
-       CGContextScaleCTM( cg , 1 , -1 );
-
-    SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );
-       m_width = bounds.size.width;
-       m_height = bounds.size.height - height;
+    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 ;
 #else
     m_macPort = CreateNewPort() ;
     GrafPtr port ;


@@ -49,8 +43,8 @@ wxScreenDC::wxScreenDC()
     Point pt = { 0,0 } ;
     LocalToGlobal( &pt ) ;
     SetPort( port ) ;
     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 );
 
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );


@@ -64,22 +58,18 @@ wxScreenDC::wxScreenDC()
     m_maxY = screenBits.bounds.bottom ;
 
     MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ;
     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
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 #endif

-       m_ok = true ;
+    m_ok = true ;

 }
 
 wxScreenDC::~wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS
 }
 
 wxScreenDC::~wxScreenDC()
 {
 #if wxMAC_USE_CORE_GRAPHICS

-       CGrafPtr grafptr = (CGrafPtr) m_displayId;
-       m_displayId = (UInt32) grafptr;
-       CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext();
-       QDEndCGContext(grafptr, &cg );
-

     delete m_graphicContext;
     m_graphicContext = NULL;
     delete m_graphicContext;
     m_graphicContext = NULL;

+    DisposeWindow((WindowRef) m_overlayWindow );

 #else
     if ( m_macPort )
         DisposePort( (CGrafPtr) m_macPort ) ;
 #else
     if ( m_macPort )
         DisposePort( (CGrafPtr) m_macPort ) ;