X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b668a73527cd08aae1321bfb1c604c9b96fffbed..a174f139e105c38ae852104eb6a894b3a0d88e07:/src/mac/carbon/aga.cpp

diff --git a/src/mac/carbon/aga.cpp b/src/mac/carbon/aga.cpp
index 9a752cbe6d..66da32984c 100644
--- a/src/mac/carbon/aga.cpp
+++ b/src/mac/carbon/aga.cpp
@@ -2,9 +2,9 @@
 #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);
@@ -2556,71 +2556,56 @@ void AGAApplyThemeBackground(ThemeBackgroundKind 	inKind,
 
 #endif // !TARGET_CARBON
 
+// this helper class stores and restores the current grafport
+// status in a theme savvy manner, pen mode, patterns and fonts
+// attributes
+
 AGAPortHelper::AGAPortHelper( GrafPtr newport) 
 {
-	GetPort( &port ) ;
-	SetPort( newport ) ;
-//	wxASSERT( newport->portRect.left == 0 && newport->portRect.top == 0 ) ; 
-	GetPenState( &oldPenState ) ;
-	GetBackColor( &oldBackColor ) ;
-	GetForeColor( &oldForeColor ) ;
-
-	clip = NewRgn() ;
-	GetClip( clip );
-	font = GetPortTextFont( newport);
-	size = GetPortTextSize( newport);
-	style = GetPortTextFace( newport);
-	mode = GetPortTextMode( newport);	
-	nport = newport ;
-
+  m_clip = NULL ;
+  Setup( newport ) ;
 }
 AGAPortHelper::AGAPortHelper()
 {
-	clip = NULL ;
+	m_clip = NULL ;
 }
+
 void AGAPortHelper::Setup( GrafPtr newport )
 {
-	GetPort( &port ) ;
+	GetPort( &m_oldPort ) ;
 	SetPort( newport ) ;
-//	wxASSERT( newport->portRect.left == 0 && newport->portRect.top == 0 ) ; 
-	GetPenState( &oldPenState ) ;
-	GetBackColor( &oldBackColor ) ;
-	GetForeColor( &oldForeColor ) ;
-	wxASSERT( clip == NULL ) ;
-	clip = NewRgn() ;
-	GetClip( clip );
-	font = GetPortTextFont( newport);
-	size = GetPortTextSize( newport);
-	style = GetPortTextFace( newport);
-	mode = GetPortTextMode( newport);	
-	nport = newport ;
+	wxASSERT_MSG( m_clip == NULL , "Cannot call setup twice" ) ;
+	m_clip = NewRgn() ;
+	GetClip( m_clip );
+	m_textFont = GetPortTextFont( newport);
+	m_textSize = GetPortTextSize( newport);
+	m_textStyle = GetPortTextFace( newport);
+	m_textMode = GetPortTextMode( newport);	
+	GetThemeDrawingState( &m_drawingState ) ;
+	m_currentPort = newport ;
 }
 void AGAPortHelper::Clear()
 {
-	if ( clip )
+	if ( m_clip )
 	{
-		DisposeRgn( clip ) ;
-		clip = NULL ;
+		DisposeRgn( m_clip ) ;
+		DisposeThemeDrawingState( m_drawingState ) ;
+		m_clip = NULL ;
 	}
 }
 AGAPortHelper::~AGAPortHelper()
 {
-	if ( clip )
+	if ( m_clip )
 	{
-		SetPort( nport ) ;
-		PenNormal() ;
-		SetClip( clip ) ;
-		DisposeRgn( clip ) ;
-		RGBForeColor(&oldForeColor);
-		RGBBackColor(&oldBackColor);
-		SetPenState(&oldPenState);				
-
-		TextFont( font );
-		TextSize( size );
-		TextFace( style );
-		TextMode( mode );
-		SetOrigin( 0 , 0 ) ;
-		SetPort( port ) ;
+		SetPort( m_currentPort ) ;
+		SetClip( m_clip ) ;
+		DisposeRgn( m_clip ) ;
+		TextFont( m_textFont );
+		TextSize( m_textSize );
+		TextFace( m_textStyle );
+		TextMode( m_textMode );
+		SetThemeDrawingState( m_drawingState , true ) ;
+		SetPort( m_oldPort ) ;
 	}
 }