fixed wxTaskBarIcon compilation

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

diff --git a/src/mac/aga.cpp b/src/mac/aga.cpp
index 1f3310aca5b289cd5c03ea8298da40ef2b2ee830..64827558b00742659d8f244a23b72ec7b4690d9d 100644 (file)
--- a/src/mac/aga.cpp
+++ b/src/mac/aga.cpp
@@ -2,9 +2,9 @@
 #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);


@@ -2586,7 +2586,7 @@ void AGAPortHelper::Setup( GrafPtr newport )
        GetPenState( &oldPenState ) ;
        GetBackColor( &oldBackColor ) ;
        GetForeColor( &oldForeColor ) ;
        GetPenState( &oldPenState ) ;
        GetBackColor( &oldBackColor ) ;
        GetForeColor( &oldForeColor ) ;

-
+       wxASSERT( clip == NULL ) ;

        clip = NewRgn() ;
        GetClip( clip );
        font = GetPortTextFont( newport);
        clip = NewRgn() ;
        GetClip( clip );
        font = GetPortTextFont( newport);


@@ -2608,6 +2608,7 @@ AGAPortHelper::~AGAPortHelper()
        if ( clip )
        {
                SetPort( nport ) ;
        if ( clip )
        {
                SetPort( nport ) ;

+               PenNormal() ;

                SetClip( clip ) ;
                DisposeRgn( clip ) ;
                RGBForeColor(&oldForeColor);
                SetClip( clip ) ;
                DisposeRgn( clip ) ;
                RGBForeColor(&oldForeColor);


@@ -2620,7 +2621,6 @@ AGAPortHelper::~AGAPortHelper()
                TextMode( mode );
                SetOrigin( 0 , 0 ) ;
                SetPort( port ) ;
                TextMode( mode );
                SetOrigin( 0 , 0 ) ;
                SetPort( port ) ;

-               wxDC::MacInvalidateSetup() ;

        }
 }
 
        }
 }