Updated to version 1.40 of Scintilla

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

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 92cb39201b4da56ca1860dcdded712904796029b..74533a7442e23485cf71be7ef8b104fd8eaf0529 100644 (file)
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -39,7 +39,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
  * wxWindowDC
  */
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 wxWindowDC::wxWindowDC() 
 {
@@ -48,7 +48,7 @@ wxWindowDC::wxWindowDC()
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
        WindowRef windowref ;
-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;
        
        // this time it is really the full window
        
@@ -59,8 +59,8 @@ wxWindowDC::wxWindowDC(wxWindow *the_canvas)
        m_maxX = size.x  ;
        m_maxY = size.y ; 
 
-       MacSetupPort() ;
        m_ok = TRUE ;
+  SetBackground(wxBrush(the_canvas->GetBackgroundColour(), wxSOLID));
 }
 
 wxWindowDC::~wxWindowDC()
@@ -78,11 +78,10 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
        WindowRef windowref ;
-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;
        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
        m_macPort = UMAGetWindowPort( windowref ) ;
-       MacSetupPort() ;
        m_minY = m_minX =  0;
        wxSize size = window->GetSize() ;
        m_maxX = size.x  ;
@@ -107,13 +106,13 @@ wxPaintDC::wxPaintDC()
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
        WindowRef windowref ;
-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;
        
        window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
 
        m_macPort = UMAGetWindowPort( windowref ) ;
-       MacSetupPort() ;
        m_ok = TRUE ;
+       /*
        wxCoord x , y ,w , h ;
        window->GetUpdateRegion().GetBox( x , y , w , h ) ;
        m_minY = m_minX =  0;
@@ -121,6 +120,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        SetClippingRegion( x , y , w , h ) ;
+       */
        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }