added wxBitmap::CopyFromIcon and wxIcon::CopyFromBitmap to wxMotif

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

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 6312bc3c82660d8115ef6a2fb63f7df2ef7da2f1..eb9d6e467be9e033484a5089a8b8a46e2f262042 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
@@ -47,16 +49,17 @@ wxWindowDC::wxWindowDC()
 
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
-       WindowRef windowref ;
-       wxWindowMac* rootwindow ;
+       wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ;
+       WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
        
-       // this time it is really the full window
-       Rect clipRect ;
-       the_canvas->MacGetPortParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow );
-       SetRectRgn( m_macBoundaryClipRgn , clipRect.left , clipRect.top , clipRect.right , clipRect.bottom ) ;
-       SectRgn( m_macBoundaryClipRgn , the_canvas->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
-       OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
-       CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
+       int x , y ;
+       x = y = 0 ;
+       the_canvas->MacWindowToRootWindow( &x , &y ) ;
+       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() ;
@@ -81,21 +84,23 @@ wxClientDC::wxClientDC()
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
-       WindowRef windowref ;
-       wxWindowMac* rootwindow ;
-       
-       Rect clipRect ;
+       wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+       WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
        wxPoint origin = window->GetClientAreaOrigin() ;
-       
-       window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow );
-       SetRectRgn( m_macBoundaryClipRgn , clipRect.left + origin.x , clipRect.top + origin.y , clipRect.right + origin.x , clipRect.bottom + origin.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 ) ;
+       wxSize size = window->GetClientSize() ;
+       int x , y ;
+       x = origin.x ;
+       y = origin.y ;
+       window->MacWindowToRootWindow( &x , &y ) ;
+       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;
-       wxSize size = window->GetSize() ;
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        m_ok = TRUE ;
@@ -117,32 +122,29 @@ wxPaintDC::wxPaintDC()
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
-       WindowRef windowref ;
-       wxWindowMac* rootwindow ;
-       
-       Rect clipRect ;
+       wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+       WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
        wxPoint origin = window->GetClientAreaOrigin() ;
-       
-       window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow );
-       SetRectRgn( m_macBoundaryClipRgn , clipRect.left + origin.x , clipRect.top + origin.y , clipRect.right + origin.x , clipRect.bottom + origin.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 ) ;
+       wxSize size = window->GetClientSize() ;
+       int x , y ;
+       x = origin.x ;
+       y = origin.y ;
+       window->MacWindowToRootWindow( &x , &y ) ;
+       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_ok = TRUE ;
-       /*
-       wxCoord x , y ,w , h ;
-       window->GetUpdateRegion().GetBox( x , y , w , h ) ;
        m_minY = m_minX =  0;
-       wxSize size = window->GetSize() ;
        m_maxX = size.x  ;
        m_maxY = size.y ; 
-       SetClippingRegion( x , y , w , h ) ;
-       */
+       m_ok = TRUE ;
   SetBackground(window->MacGetBackgroundBrush());
-  SetFont(window->GetFont() ) ;
+       SetFont( window->GetFont() ) ;
 }
 
 wxPaintDC::~wxPaintDC()