X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..785f5eaa05195f5e44a974861864324667a3326e:/src/mac/carbon/dcclient.cpp?ds=sidebyside

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 12100b81cd..f28c6dc576 100644
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.cpp
 // Purpose:     wxClientDC class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -16,7 +16,10 @@
 #include "wx/dcclient.h"
 #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
@@ -28,87 +31,145 @@
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
+#endif
 
 /*
  * wxWindowDC
  */
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
+
+wxWindowDC::wxWindowDC() 
+{
+    m_window = NULL ;
+}
 
-wxWindowDC::wxWindowDC(void)
+wxWindowDC::wxWindowDC(wxWindow *window) 
 {
+    m_window = window ;
+    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
+    
+    int x , y ;
+    x = y = 0 ;
+    window->MacWindowToRootWindow( &x , &y ) ;
+    m_macLocalOrigin.x = x ;
+    m_macLocalOrigin.y = y ;
+    CopyRgn( (RgnHandle) window->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_ok = TRUE ;
+    SetBackground(window->MacGetBackgroundBrush());
 }
 
-wxWindowDC::wxWindowDC(wxWindow *the_canvas)
+wxWindowDC::~wxWindowDC()
 {
-	WindowRef windowref ;
-	wxWindow* rootwindow ;
-	
-	// this time it is really the full window
-	
-	the_canvas->MacGetPortParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
-	m_macPort = UMAGetWindowPort( windowref ) ;
-	MacSetupPort() ;
- 	m_ok = TRUE ;
 }
 
-wxWindowDC::~wxWindowDC(void)
+void wxWindowDC::DoGetSize( int* width, int* height ) const
 {
+    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+
+    m_window->GetSize(width, height);
 }
 
 /*
  * wxClientDC
  */
 
-wxClientDC::wxClientDC(void)
+wxClientDC::wxClientDC()
 {
+    m_window = NULL ;
 }
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
-	WindowRef windowref ;
-	wxWindow* rootwindow ;
-	
-	window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
-	m_macPort = UMAGetWindowPort( windowref ) ;
-	MacSetupPort() ;
- 	m_ok = TRUE ;
-  	SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
-	SetFont( window->GetFont() ) ;
+    m_window = window ;
+    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+    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.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_ok = TRUE ;
+    SetBackground(window->MacGetBackgroundBrush());
+    SetFont( window->GetFont() ) ;
+}
+
+wxClientDC::~wxClientDC()
+{
 }
 
-wxClientDC::~wxClientDC(void)
+void wxClientDC::DoGetSize(int *width, int *height) const
 {
+    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+
+    m_window->GetClientSize( width, height );
 }
 
+
 /*
  * wxPaintDC
  */
 
-wxPaintDC::wxPaintDC(void)
+wxPaintDC::wxPaintDC()
 {
+    m_window = NULL ;
 }
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
-	WindowRef windowref ;
-	wxWindow* rootwindow ;
-	
-	window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
-
-	m_macPort = UMAGetWindowPort( windowref ) ;
-	MacSetupPort() ;
- 	m_ok = TRUE ;
-	long x , y ,w , h ;
-	window->GetUpdateRegion().GetBox( x , y , w , h ) ;
-	SetClippingRegion( x , y , w , h ) ;
-  	SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
-  	SetFont(window->GetFont() ) ;
+    m_window = window ;
+    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+    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.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 ;
+    SetBackground(window->MacGetBackgroundBrush());
+    SetFont( window->GetFont() ) ;
 }
 
 wxPaintDC::~wxPaintDC()
 {
 }
+
+void wxPaintDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+
+    m_window->GetClientSize( width, height );
+}
+
+