Allow wxSTC to have scrollbars

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

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index fa2590f1bfe35ca6712679eb936c7ce6444e45ab..bc1a0827a4c0771d88473aa77cd1b3b0bcf34dbe 100644 (file)
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -17,7 +17,9 @@
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"
+#include "wx/toplevel.h"
 #include <math.h>
+#include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -48,16 +50,16 @@ wxWindowDC::wxWindowDC()
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
        wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ;
-       WindowRef windowref = rootwindow->MacGetWindowRef() ;
+       WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
        
        int x , y ;
        x = y = 0 ;
        the_canvas->MacWindowToRootWindow( &x , &y ) ;
-       m_macLocalOrigin.h = x ;
-       m_macLocalOrigin.v = y ;
-       CopyRgn( the_canvas->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
-       OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
-       CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
+       m_macLocalOrigin.x = x ;
+       m_macLocalOrigin.y = y ;
+       CopyRgn( (RgnHandle) the_canvas->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
+       OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
+       CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_minY = m_minX =  0;
        wxSize size = the_canvas->GetSize() ;
@@ -83,20 +85,22 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
        wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-       WindowRef windowref = rootwindow->MacGetWindowRef() ;
+        if (!rootwindow)
+            return;
+       WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
        wxPoint origin = window->GetClientAreaOrigin() ;
        wxSize size = window->GetClientSize() ;
        int x , y ;
        x = origin.x ;
        y = origin.y ;
        window->MacWindowToRootWindow( &x , &y ) ;
-       m_macLocalOrigin.h = x ;
-       m_macLocalOrigin.v = y ;
-       SetRectRgn( m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
-       SectRgn( m_macBoundaryClipRgn , window->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
-       OffsetRgn( m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
-       OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
-       CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
+       m_macLocalOrigin.x = x ;
+       m_macLocalOrigin.y = y ;
+       SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
+       SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
+       OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
+       OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
+       CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_minY = m_minX =  0;
        m_maxX = size.x  ;
@@ -121,21 +125,21 @@ wxPaintDC::wxPaintDC()
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
        wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
-       WindowRef windowref = rootwindow->MacGetWindowRef() ;
+       WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
        wxPoint origin = window->GetClientAreaOrigin() ;
        wxSize size = window->GetClientSize() ;
        int x , y ;
        x = origin.x ;
        y = origin.y ;
        window->MacWindowToRootWindow( &x , &y ) ;
-       m_macLocalOrigin.h = x ;
-       m_macLocalOrigin.v = y ;
-       SetRectRgn( m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
-       SectRgn( m_macBoundaryClipRgn , window->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
-       OffsetRgn( m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
-  SectRgn( m_macBoundaryClipRgn  , window->GetUpdateRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
-       OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
-       CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
+       m_macLocalOrigin.x = x ;
+       m_macLocalOrigin.y = y ;
+       SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
+       SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
+       OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
+  SectRgn( (RgnHandle) m_macBoundaryClipRgn  , (RgnHandle) window->GetUpdateRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
+       OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
+       CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_minY = m_minX =  0;
        m_maxX = size.x  ;