added missing include file for Apple DevTools

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

diff --git a/src/mac/carbon/aga.cpp b/src/mac/carbon/aga.cpp
index 6c24f5ddf82ea9626f3db58bbf15cdcdbd6f2d7e..66da32984c52987a2386a5ae35fecdba326d63e7 100644 (file)
--- 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"
 
 #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);
 #include <PictUtils.h>
 
 pascal SInt32 AGAProgressBarDefProc (SInt16 procID, ControlHandle theControl, ControlDefProcMessage message, SInt32 param);


@@ -2555,71 +2556,56 @@ void AGAApplyThemeBackground(ThemeBackgroundKind        inKind,
 
 #endif // !TARGET_CARBON
 
 
 #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) 
 {
 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()
 {
 }
 AGAPortHelper::AGAPortHelper()
 {

-       clip = NULL ;
+       m_clip = NULL ;

 }
 }

+

 void AGAPortHelper::Setup( GrafPtr newport )
 {
 void AGAPortHelper::Setup( GrafPtr newport )
 {

-       GetPort( &port ) ;
+       GetPort( &m_oldPort ) ;

        SetPort( newport ) ;
        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 ;
+       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()
 {
 }
 void AGAPortHelper::Clear()
 {

-       if ( clip )
+       if ( m_clip )

        {
        {

-               DisposeRgn( clip ) ;
-               clip = NULL ;
+               DisposeRgn( m_clip ) ;
+               DisposeThemeDrawingState( m_drawingState ) ;
+               m_clip = NULL ;

        }
 }
 AGAPortHelper::~AGAPortHelper()
 {
        }
 }
 AGAPortHelper::~AGAPortHelper()
 {

-       if ( clip )
+       if ( m_clip )

        {
        {

-               SetPort( nport ) ;
-               SetClip( clip ) ;
-               DisposeRgn( clip ) ;
-               RGBForeColor(&oldForeColor);
-               RGBBackColor(&oldBackColor);
-               SetPenState(&oldPenState);                              
-
-               TextFont( font );
-               TextSize( size );
-               TextFace( style );
-               TextMode( mode );
-               SetOrigin( 0 , 0 ) ;
-               SetPort( port ) ;
-               wxDC::MacInvalidateSetup() ;
+               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 ) ;

        }
 }
 
        }
 }