fix for using wxDataObjectComposite with the clipboard

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 19d325a772483446f72f586ba7b61d7b0fd521f8..74533a7442e23485cf71be7ef8b104fd8eaf0529 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -39,7 +39,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
  * wxWindowDC
  */
 
  * wxWindowDC
  */
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 
 wxWindowDC::wxWindowDC() 
 {
 
 wxWindowDC::wxWindowDC() 
 {


@@ -48,7 +48,7 @@ wxWindowDC::wxWindowDC()
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
        WindowRef windowref ;
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
        WindowRef windowref ;

-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;

        
        // this time it is really the full window
        
        
        // this time it is really the full window
        


@@ -78,7 +78,7 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
        WindowRef windowref ;
 wxClientDC::wxClientDC(wxWindow *window)
 {
        WindowRef windowref ;

-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;

        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
        m_macPort = UMAGetWindowPort( windowref ) ;
        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
        m_macPort = UMAGetWindowPort( windowref ) ;


@@ -106,12 +106,13 @@ wxPaintDC::wxPaintDC()
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
        WindowRef windowref ;
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
        WindowRef windowref ;

-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;

        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
 
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_ok = TRUE ;
        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
 
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_ok = TRUE ;

+       /*

        wxCoord x , y ,w , h ;
        window->GetUpdateRegion().GetBox( x , y , w , h ) ;
        m_minY = m_minX =  0;
        wxCoord x , y ,w , h ;
        window->GetUpdateRegion().GetBox( x , y , w , h ) ;
        m_minY = m_minX =  0;


@@ -119,6 +120,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        SetClippingRegion( x , y , w , h ) ;
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        SetClippingRegion( x , y , w , h ) ;

+       */

        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }
        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }