X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b89dac7816168bc86d4862edb394e681c161a3e3..ac0fa9eff8c1137564bcd88084e3c1cdac54b679:/src/mac/carbon/aga.cpp?ds=sidebyside

diff --git a/src/mac/carbon/aga.cpp b/src/mac/carbon/aga.cpp
index 6c24f5ddf8..9a752cbe6d 100644
--- a/src/mac/carbon/aga.cpp
+++ b/src/mac/carbon/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() ;
 	}
 }