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

diff --git a/src/mac/carbon/aga.cpp b/src/mac/carbon/aga.cpp
index 0185303bd1..64827558b0 100644
--- a/src/mac/carbon/aga.cpp
+++ b/src/mac/carbon/aga.cpp
@@ -1,9 +1,10 @@
+#include "wx/dc.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 
-#if !TARGET_CARBON
+#if 0 // TO BE REMOVED SOON
 
-#include <extcdef.h>
+//#include <extcdef.h>
 #include <PictUtils.h>
 
 pascal SInt32 AGAProgressBarDefProc (SInt16 procID, ControlHandle theControl, ControlDefProcMessage message, SInt32 param);
@@ -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);