Mac-ify wxTreeCtrl further.

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

diff --git a/src/mac/aga.cpp b/src/mac/aga.cpp
index 6c24f5ddf82ea9626f3db58bbf15cdcdbd6f2d7e..9a752cbe6d9fe609844955e65a3f0605cfeef32e 100644 (file)
--- a/src/mac/aga.cpp
+++ b/src/mac/aga.cpp
@@ -1,3 +1,4 @@
+#include "wx/dc.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 
@@ -2585,7 +2586,7 @@ void AGAPortHelper::Setup( GrafPtr newport )
        GetPenState( &oldPenState ) ;
        GetBackColor( &oldBackColor ) ;
        GetForeColor( &oldForeColor ) ;
-
+       wxASSERT( clip == NULL ) ;
        clip = NewRgn() ;
        GetClip( clip );
        font = GetPortTextFont( newport);
@@ -2607,6 +2608,7 @@ AGAPortHelper::~AGAPortHelper()
        if ( clip )
        {
                SetPort( nport ) ;
+               PenNormal() ;
                SetClip( clip ) ;
                DisposeRgn( clip ) ;
                RGBForeColor(&oldForeColor);
@@ -2619,7 +2621,6 @@ AGAPortHelper::~AGAPortHelper()
                TextMode( mode );
                SetOrigin( 0 , 0 ) ;
                SetPort( port ) ;
-               wxDC::MacInvalidateSetup() ;
        }
 }