]> git.saurik.com Git - wxWidgets.git/blobdiff - src/mac/carbon/aga.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Various fixes for Textctrl and Popup Menus.
[wxWidgets.git] / src / mac / carbon / aga.cpp
diff --git a/src/mac/carbon/aga.cpp b/src/mac/carbon/aga.cpp
index 40abb5cbb9df489b2d467a9b76388da0abac3398..4f4f139e8785183f413d8c09a87c3d227bdcc91c 100644 (file)
--- a/src/mac/carbon/aga.cpp
+++ b/src/mac/carbon/aga.cpp
@@ -1,6 +1,10 @@
-#include <wx/mac/uma.h>
-#include <wx/mac/aga.h>
-#include <extcdef.h>
+#include "wx/dc.h"
+#include "wx/mac/uma.h"
+#include "wx/mac/aga.h"
+
+#if 0 // TO BE REMOVED SOON
+
+//#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);
@@ -10,158 +14,159 @@ pascal SInt32 AGAListControlDefProc (SInt16 procID, ControlHandle theControl, Co
 pascal SInt32 AGAEditTextDefProc (SInt16 procID, ControlHandle theControl, ControlDefProcMessage message, SInt32 param) ;
 pascal SInt32 AGAStaticGroupBoxTextDefProc (SInt16 procID, ControlHandle theControl, ControlDefProcMessage message, SInt32 param) ;
 
 pascal SInt32 AGAEditTextDefProc (SInt16 procID, ControlHandle theControl, ControlDefProcMessage message, SInt32 param) ;
 pascal SInt32 AGAStaticGroupBoxTextDefProc (SInt16 procID, ControlHandle theControl, ControlDefProcMessage message, SInt32 param) ;
 
-#define B                                                                                                              13
-#define        W                                                                                                               0
+#define B   13
+#define        W   0
 
 SInt16 kAGARootControlProcID ;
 int gAGABackgroundColor = 0 ;
 
 
 SInt16 kAGARootControlProcID ;
 int gAGABackgroundColor = 0 ;
 
-const RGBColor gAGAColorArray[] = {    {0xFFFF, 0xFFFF, 0xFFFF},               //      W
-                                                                                                                                               {0xEEEE, 0xEEEE, 0xEEEE},       //      1
-                                                                                                                                               {0xDDDD, 0xDDDD, 0xDDDD},       //      2
-                                                                                                                                               {0xCCCC, 0xCCCC, 0xCCCC},       //      3
-                                                                                                                                               {0xBBBB, 0xBBBB, 0xBBBB},       //      4
-                                                                                                                                               {0xAAAA, 0xAAAA, 0xAAAA},       //      5
-                                                                                                                                               {0x9999, 0x9999, 0x9999},       //      6
-                                                                                                                                               {0x8888, 0x8888, 0x8888},               //      7
-                                                                                                                                               {0x7777, 0x7777, 0x7777},               //      8
-                                                                                                                                               {0x6666, 0x6666, 0x6666},               //      9
-                                                                                                                                               {0x5555, 0x5555, 0x5555},               //      10
-                                                                                                                                               {0x4444, 0x4444, 0x4444},               //      11
-                                                                                                                                               {0x2222, 0x2222, 0x2222},               //      12
-                                                                                                                                               {0x0000, 0x0000, 0x0000}                //      B
-                                                                                                                                       };
+const RGBColor gAGAColorArray[] = {
+  {0xFFFF, 0xFFFF, 0xFFFF},    //      W
+  {0xEEEE, 0xEEEE, 0xEEEE},    //      1
+  {0xDDDD, 0xDDDD, 0xDDDD},    //      2
+  {0xCCCC, 0xCCCC, 0xCCCC},    //      3
+  {0xBBBB, 0xBBBB, 0xBBBB},    //      4
+  {0xAAAA, 0xAAAA, 0xAAAA},    //      5
+  {0x9999, 0x9999, 0x9999},    //      6
+  {0x8888, 0x8888, 0x8888},    //      7
+  {0x7777, 0x7777, 0x7777},    //      8
+  {0x6666, 0x6666, 0x6666},    //      9
+  {0x5555, 0x5555, 0x5555},    //      10
+  {0x4444, 0x4444, 0x4444},    //      11
+  {0x2222, 0x2222, 0x2222},    //      12
+  {0x0000, 0x0000, 0x0000}     //      B
+};
 
 char LAGADefaultOutline_mCorners[4][5][5] =    {
 
 char LAGADefaultOutline_mCorners[4][5][5] =    {
-                                                                                                                                                                                               //      topleft
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       { -1, -1, -1, 12,  B },
-                                                                                                                                                                                                       { -1, -1,  B,  2,  2 },
-                                                                                                                                                                                                       { -1,  B,  2,  2,  5 },
-                                                                                                                                                                                                       { 12,  2,  2,  2,  8 },
-                                                                                                                                                                                                       {  B,  2,  5,  8, -1 }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      topright
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  B, 12, -1, -1, -1 },
-                                                                                                                                                                                                       {  2,  3,  B, -1, -1 },
-                                                                                                                                                                                                       {  5,  5,  4,  B, -1 },
-                                                                                                                                                                                                       {  8,  5,  5,  7, 12 },
-                                                                                                                                                                                                       { -1,  8,  5,  8,  B }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      bottomleft
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  B,  2,  5,  8, -1 },
-                                                                                                                                                                                                       { 12,  3,  5,  5,  8 },
-                                                                                                                                                                                                       { -1,  B,  4,  5,  5 },
-                                                                                                                                                                                                       { -1, -1,  B,  7,  8 },
-                                                                                                                                                                                                       { -1, -1, -1, 12,  B }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      bottomright
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       { -1,  8,  5,  8,  B },
-                                                                                                                                                                                                       {  8,  5,  7,  8, 12 },
-                                                                                                                                                                                                       {  5,  7,  8,  B, -1 },
-                                                                                                                                                                                                       {  8,  8,  B, -1, -1 },
-                                                                                                                                                                                                       {  B, 12, -1, -1, -1 }
-                                                                                                                                                                                               }
-                                                                                                                                                                                       };
+  //   topleft
+  {
+    { -1, -1, -1, 12,  B },
+    { -1, -1,  B,  2,  2 },
+    { -1,  B,  2,  2,  5 },
+    { 12,  2,  2,  2,  8 },
+    {  B,  2,  5,  8, -1 }
+  },
+  //   topright
+  {
+    {  B, 12, -1, -1, -1 },
+    {  2,  3,  B, -1, -1 },
+    {  5,  5,  4,  B, -1 },
+    {  8,  5,  5,  7, 12 },
+    { -1,  8,  5,  8,  B }
+  },
+  //   bottomleft
+  {
+    {  B,  2,  5,  8, -1 },
+    { 12,  3,  5,  5,  8 },
+    { -1,  B,  4,  5,  5 },
+    { -1, -1,  B,  7,  8 },
+    { -1, -1, -1, 12,  B }
+  },
+  //   bottomright
+  {
+    { -1,  8,  5,  8,  B },
+    {  8,  5,  7,  8, 12 },
+    {  5,  7,  8,  B, -1 },
+    {  8,  8,  B, -1, -1 },
+    {  B, 12, -1, -1, -1 }
+  }
+};
 
 char LAGAPushButton_mCorners[3][4][4][4] =     {
 
 char LAGAPushButton_mCorners[3][4][4][4] =     {
-                                                                                                                                                                                       //      Enabled
-                                                                                                                                                                                       {
-                                                                                                                                                                                               //      topleft
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       { -1, -1, 12,  B },
-                                                                                                                                                                                                       { -1,  B,  4,  2 },
-                                                                                                                                                                                                       { 12,  4,  W,  W },
-                                                                                                                                                                                                       {  B,  2,  W,  W }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      topright
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  B, 12, -1, -1 },
-                                                                                                                                                                                                       {  2,  4,  B, -1 },
-                                                                                                                                                                                                       {  W,  2,  5, 12 },
-                                                                                                                                                                                                       {  2,  5,  8,  B }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      bottomleft
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  B,  2,  W,  2 },
-                                                                                                                                                                                                       { 12,  4,  2,  5 },
-                                                                                                                                                                                                       { -1,  B,  4,  8 },
-                                                                                                                                                                                                       { -1, -1, 12,  B }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      bottomright
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  5,  5,  8,  B },
-                                                                                                                                                                                                       {  5,  8,  8, 12 },
-                                                                                                                                                                                                       {  8,  8,  B, -1 },
-                                                                                                                                                                                                       {  B, 12, -1, -1 }
-                                                                                                                                                                                               }
-                                                                                                                                                                                       },
-                                                                                                                                                                                       //      Pressed
-                                                                                                                                                                                       {
-                                                                                                                                                                                               //      topleft
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       { -1, -1, 12,  B },
-                                                                                                                                                                                                       { -1,  B, 10,  8 },
-                                                                                                                                                                                                       { 12, 10,  8,  4 },
-                                                                                                                                                                                                       {  B,  8,  4,  4 }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      topright
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  B, 12, -1, -1 },
-                                                                                                                                                                                                       {  8, 10,  B, -1 },
-                                                                                                                                                                                                       {  4,  4,  8, 12 },
-                                                                                                                                                                                                       {  4,  4,  4,  B }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      bottomleft
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  B,  8,  4,  4 },
-                                                                                                                                                                                                       { 12, 10,  4,  4 },
-                                                                                                                                                                                                       { -1,  B, 10,  4 },
-                                                                                                                                                                                                       { -1, -1, 12,  B }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      bottomright
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  4,  4,  4,  B },
-                                                                                                                                                                                                       {  4,  4, 10, 12 },
-                                                                                                                                                                                                       {  4, 10,  B, -1 },
-                                                                                                                                                                                                       {  B, 12, -1, -1 }
-                                                                                                                                                                                               }
-                                                                                                                                                                                       },
-                                                                                                                                                                                       //      Disabled
-                                                                                                                                                                                       {
-                                                                                                                                                                                               //      topleft
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       { -1, -1,  7,  7 },
-                                                                                                                                                                                                       { -1,  7,  4,  2 },
-                                                                                                                                                                                                       {  7,  4,  1,  1 },
-                                                                                                                                                                                                       {  7,  2,  1,  1 }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      topright
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  7,  7, -1, -1 },
-                                                                                                                                                                                                       {  2,  4,  7, -1 },
-                                                                                                                                                                                                       {  1,  2,  4,  7 },
-                                                                                                                                                                                                       {  2,  4,  5,  7 }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      bottomleft
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  7,  2,  1,  2 },
-                                                                                                                                                                                                       {  7,  4,  2,  4 },
-                                                                                                                                                                                                       { -1,  7,  4,  5 },
-                                                                                                                                                                                                       { -1, -1,  7,  7 }
-                                                                                                                                                                                               },
-                                                                                                                                                                                               //      bottomright
-                                                                                                                                                                                               {
-                                                                                                                                                                                                       {  4,  4,  5,  7 },
-                                                                                                                                                                                                       {  4,  5,  5,  7 },
-                                                                                                                                                                                                       {  5,  5,  7, -1 },
-                                                                                                                                                                                                       {  7,  7, -1, -1 }
-                                                                                                                                                                                               }
-                                                                                                                                                                                       }
-                                                                                                                                                                               };
+  //   Enabled
+  {
+    // topleft
+    {
+      { -1, -1, 12,  B },
+      { -1,  B,  4,  2 },
+      { 12,  4,  W,  W },
+      {  B,  2,  W,  W }
+    },
+    // topright
+    {
+      {  B, 12, -1, -1 },
+      {  2,  4,  B, -1 },
+      {  W,  2,  5, 12 },
+      {  2,  5,  8,  B }
+    },
+    // bottomleft
+    {
+      {  B,  2,  W,  2 },
+      { 12,  4,  2,  5 },
+      { -1,  B,  4,  8 },
+      { -1, -1, 12,  B }
+    },
+    // bottomright
+    {
+      {  5,  5,  8,  B },
+      {  5,  8,  8, 12 },
+      {  8,  8,  B, -1 },
+      {  B, 12, -1, -1 }
+    }
+  },
+  //   Pressed
+  {
+    // topleft
+    {
+      { -1, -1, 12,  B },
+      { -1,  B, 10,  8 },
+      { 12, 10,  8,  4 },
+      {  B,  8,  4,  4 }
+    },
+    // topright
+    {
+      {  B, 12, -1, -1 },
+      {  8, 10,  B, -1 },
+      {  4,  4,  8, 12 },
+      {  4,  4,  4,  B }
+    },
+    // bottomleft
+    {
+      {  B,  8,  4,  4 },
+      { 12, 10,  4,  4 },
+      { -1,  B, 10,  4 },
+      { -1, -1, 12,  B }
+    },
+    // bottomright
+    {
+      {  4,  4,  4,  B },
+      {  4,  4, 10, 12 },
+      {  4, 10,  B, -1 },
+      {  B, 12, -1, -1 }
+    }
+  },
+  //   Disabled
+  {
+    // topleft
+    {
+      { -1, -1,  7,  7 },
+      { -1,  7,  4,  2 },
+      {  7,  4,  1,  1 },
+      {  7,  2,  1,  1 }
+    },
+    // topright
+    {
+      {  7,  7, -1, -1 },
+      {  2,  4,  7, -1 },
+      {  1,  2,  4,  7 },
+      {  2,  4,  5,  7 }
+    },
+    // bottomleft
+    {
+      {  7,  2,  1,  2 },
+      {  7,  4,  2,  4 },
+      { -1,  7,  4,  5 },
+      { -1, -1,  7,  7 }
+    },
+    // bottomright
+    {
+      {  4,  4,  5,  7 },
+      {  4,  5,  5,  7 },
+      {  5,  5,  7, -1 },
+      {  7,  7, -1, -1 }
+    }
+  }
+};
 
 RGBColor gAGARamp[] =
 {
 
 RGBColor gAGARamp[] =
 {
@@ -600,6 +605,10 @@ void AGADeactivateControl( ControlHandle inControl )
                        }
                }
        }
                        }
                }
        }
+       else
+       {
+               ::HiliteControl( inControl , 255 ) ;
+       }
 }
 
 void AGAActivateControl( ControlHandle inControl ) 
 }
 
 void AGAActivateControl( ControlHandle inControl ) 
@@ -615,6 +624,10 @@ void AGAActivateControl( ControlHandle inControl )
                        }
                }
        }
                        }
                }
        }
+       else
+       {
+               ::HiliteControl( inControl , 0 ) ;
+       }
 }
 
 OSErr AGASetKeyboardFocus                              (WindowPtr                              inWindow,
 }
 
 OSErr AGASetKeyboardFocus                              (WindowPtr                              inWindow,
@@ -718,6 +731,7 @@ void DisposeExtCDEFInfo( ControlHandle theControl)
                        DisposeHandle( info->children ) ;
                        info->children = NULL ;
                        free( (void*) (**theControl).contrlRfCon ) ;
                        DisposeHandle( info->children ) ;
                        info->children = NULL ;
                        free( (void*) (**theControl).contrlRfCon ) ;
+                       (**theControl).contrlRfCon = NULL ;
                }
        }
 }
                }
        }
 }
@@ -922,51 +936,6 @@ void AGASetFontStyle( ControlFontStyleRec *fontstyle )
                ::RGBBackColor( &fontstyle->backColor ) ;
 } ;
 
                ::RGBBackColor( &fontstyle->backColor ) ;
 } ;
 
-class AGAPortHelper 
-{
-public :
-       AGAPortHelper() 
-       {
-               GetPenState( &oldPenState ) ;
-               GetBackColor( &oldBackColor ) ;
-               GetForeColor( &oldForeColor ) ;
-
-               GetPort( &port ) ;
-               clip = NewRgn() ;
-               GetClip( clip );
-               font = port->txFont;
-               size = port->txSize;
-               style = port->txFace;
-               mode = port->txMode;    
-
-       }
-       ~AGAPortHelper()
-       {
-                       SetPort( port ) ;
-                       SetClip( clip ) ;
-                       DisposeRgn( clip ) ;
-                       RGBForeColor(&oldForeColor);
-                       RGBBackColor(&oldBackColor);
-                       SetPenState(&oldPenState);                              
-
-                       TextFont( font );
-                       TextSize( size );
-                       TextFace( style );
-                       TextMode( mode );
-       }
-
-private :
-                               GrafPtr                 port ;
-                               PenState                oldPenState ;
-                               RGBColor                oldForeColor ;
-                               RGBColor                oldBackColor ;
-                               RgnHandle               clip ;
-                               short                           font ;
-                               short                           size ;
-                               short                           style ;
-                               short                   mode ;
-} ;
-
 pascal SInt32 AGAProgressBarDefProc (SInt16 procID, ControlHandle theControl, ControlDefProcMessage message, SInt32 param)
 {      
        switch( message )
 pascal SInt32 AGAProgressBarDefProc (SInt16 procID, ControlHandle theControl, ControlDefProcMessage message, SInt32 param)
 {      
        switch( message )
@@ -1079,7 +1048,7 @@ pascal SInt32 AGABevelButtonDefProc (SInt16 procID, ControlHandle theControl, Co
                                        return 0 ;
                                        
                                {
                                        return 0 ;
                                        
                                {
-                                       AGAPortHelper help() ;
+                                       wxMacPortStateHelper help((**theControl).contrlOwner) ;
                                        AGASetFontStyle( &info->fontStyle ) ;
                                        Boolean mRadioBehavior = false ;
                                        
                                        AGASetFontStyle( &info->fontStyle ) ;
                                        Boolean mRadioBehavior = false ;
                                        
@@ -1219,7 +1188,7 @@ pascal SInt32 AGAButtonDefProc (SInt16 procID, ControlHandle theControl, Control
                                        return 0 ;
                                        
                                {
                                        return 0 ;
                                        
                                {
-                                       AGAPortHelper help() ;
+                                       wxMacPortStateHelper help((**theControl).contrlOwner) ;
                                        AGASetFontStyle( &info->fontStyle ) ;
                                        Boolean mRadioBehavior = false ;
                                        
                                        AGASetFontStyle( &info->fontStyle ) ;
                                        Boolean mRadioBehavior = false ;
                                        
@@ -1456,7 +1425,7 @@ pascal SInt32 AGACheckBoxDefProc (SInt16 procID, ControlHandle theControl, Contr
                                                return 0 ;
                                                
                                        {
                                                return 0 ;
                                                
                                        {
-                                               AGAPortHelper help() ;
+                                               wxMacPortStateHelper help((**theControl).contrlOwner) ;
                                                Rect frame =  (**theControl).contrlRect ;
                                                Boolean hasColor = true;
                                                Boolean disabled = (*theControl)->contrlHilite == 255 ;
                                                Rect frame =  (**theControl).contrlRect ;
                                                Boolean hasColor = true;
                                                Boolean disabled = (*theControl)->contrlHilite == 255 ;
@@ -1652,7 +1621,7 @@ pascal SInt32 AGARadioButtonDefProc (SInt16 procID, ControlHandle theControl, Co
                                                return 0 ;
                                                
                                        {
                                                return 0 ;
                                                
                                        {
-                                               AGAPortHelper help() ;
+                                               wxMacPortStateHelper help() ;
                                                Rect frame =  (**theControl).contrlRect ;
                                                Boolean hasColor = true;
                                                Boolean disabled = (*theControl)->contrlHilite == 255 ;
                                                Rect frame =  (**theControl).contrlRect ;
                                                Boolean hasColor = true;
                                                Boolean disabled = (*theControl)->contrlHilite == 255 ;
@@ -1844,7 +1813,7 @@ pascal SInt32 AGAStaticGroupBoxTextDefProc (SInt16 procID, ControlHandle theCont
                                {
                                        bool disabled = false ;
                                        bool hasColor = true ;
                                {
                                        bool disabled = false ;
                                        bool hasColor = true ;
-                                       AGAPortHelper help() ;
+                                       wxMacPortStateHelper help((**theControl).contrlOwner) ;
                                        AGASetFontStyle( &info->fontStyle ) ;
                                        FontInfo fi ;
                                        ::GetFontInfo( &fi ) ;
                                        AGASetFontStyle( &info->fontStyle ) ;
                                        FontInfo fi ;
                                        ::GetFontInfo( &fi ) ;
@@ -1930,7 +1899,7 @@ pascal SInt32 AGAStaticTextDefProc (SInt16 procID, ControlHandle theControl, Con
                                        return 0 ;
                                        
                                {
                                        return 0 ;
                                        
                                {
-                                       AGAPortHelper help() ;
+                                       wxMacPortStateHelper help((**theControl).contrlOwner) ;
                                        AGASetFontStyle( &info->fontStyle ) ;
                                        int x = (**theControl).contrlRect.left ;
                                        int y = (**theControl).contrlRect.top ;
                                        AGASetFontStyle( &info->fontStyle ) ;
                                        int x = (**theControl).contrlRect.left ;
                                        int y = (**theControl).contrlRect.top ;
@@ -2125,7 +2094,7 @@ pascal SInt32 AGAEditTextDefProc (SInt16 procID, ControlHandle theControl, Contr
        {
                case initCntl :
                        {
        {
                case initCntl :
                        {
-                               AGAPortHelper help() ;
+                               wxMacPortStateHelper help((**theControl).contrlOwner) ;
                                SetPort( (**theControl).contrlOwner ) ;
                                ::TextFont( kFontIDGeneva ) ; 
                                ::TextSize( 10 ) ;
                                SetPort( (**theControl).contrlOwner ) ;
                                ::TextFont( kFontIDGeneva ) ; 
                                ::TextSize( 10 ) ;
@@ -2147,7 +2116,7 @@ pascal SInt32 AGAEditTextDefProc (SInt16 procID, ControlHandle theControl, Contr
                        break ;
                case drawCntl :
                        {
                        break ;
                case drawCntl :
                        {
-                               AGAPortHelper help() ;
+                               wxMacPortStateHelper help((**theControl).contrlOwner) ;
                                AGASetFontStyle( &info->fontStyle ) ;
                                SetPort( (**theControl).contrlOwner ) ;
                                RGBBackColor( &gAGARamp[ kAGAWhite ] ) ;
                                AGASetFontStyle( &info->fontStyle ) ;
                                SetPort( (**theControl).contrlOwner ) ;
                                RGBBackColor( &gAGARamp[ kAGAWhite ] ) ;
@@ -2254,9 +2223,8 @@ pascal SInt32 AGAEditTextDefProc (SInt16 procID, ControlHandle theControl, Contr
                        break ;
                case kControlMsgKeyDown :
                        {
                        break ;
                case kControlMsgKeyDown :
                        {
-                               AGAPortHelper help() ;
+                               wxMacPortStateHelper help( (**theControl).contrlOwner ) ;
                                AGASetFontStyle( &info->fontStyle ) ;
                                AGASetFontStyle( &info->fontStyle ) ;
-                               SetPort( (**theControl).contrlOwner ) ;
                                RGBBackColor( &gAGARamp[ kAGAWhite ] ) ;
                                RGBForeColor( &gAGARamp[ kAGABlack ] ) ;
                                ControlKeyDownRec * rec = (ControlKeyDownRec*) param ;
                                RGBBackColor( &gAGARamp[ kAGAWhite ] ) ;
                                RGBForeColor( &gAGARamp[ kAGABlack ] ) ;
                                ControlKeyDownRec * rec = (ControlKeyDownRec*) param ;
@@ -2364,7 +2332,7 @@ pascal SInt32 AGAListControlDefProc (SInt16 procID, ControlHandle theControl, Co
                        break ;
                case drawCntl :
                        {
                        break ;
                case drawCntl :
                        {
-                               AGAPortHelper help() ;
+                               wxMacPortStateHelper help((**theControl).contrlOwner) ;
                                AGASetFontStyle( &info->fontStyle ) ;
                                RGBBackColor( &gAGARamp[ kAGAWhite ] ) ;
                                EraseRect( &(**theControl).contrlRect ) ;
                                AGASetFontStyle( &info->fontStyle ) ;
                                RGBBackColor( &gAGARamp[ kAGAWhite ] ) ;
                                EraseRect( &(**theControl).contrlRect ) ;
@@ -2578,4 +2546,18 @@ void                     AGASetThemeWindowBackground             (WindowRef                              inWindow,
        SetPort( port ) ;
 }
 
        SetPort( port ) ;
 }
 
+void AGAApplyThemeBackground(ThemeBackgroundKind       inKind,
+                                                                const Rect *                   bounds,
+                                                                ThemeDrawState                 inState,
+                                                                SInt16                                 inDepth,
+                                                                Boolean                                inColorDev) 
+{
+}
+
+#endif // !TARGET_CARBON
+
+// this helper class stores and restores the current grafport
+// status in a theme savvy manner, pen mode, patterns and fonts
+// attributes
+
 
 
wxWidgets (Impactor)