made Update be window local (before was updating the entire window), ScrollWindow...

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 59daa769db71de98da9e688e22ca1b9bb342bc60..c8073ac49f4df870375ad8bf425a2d62b488edae 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -1,3 +1,14 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        uma.cpp
+// Purpose:     UMA support
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     The wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #include "wx/defs.h"
 #include "wx/dc.h"
 #include <MacTextEditor.h>
 #include "wx/defs.h"
 #include "wx/dc.h"
 #include <MacTextEditor.h>


@@ -22,7 +33,7 @@
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
 // the application so all wxWindows code can safely assume that appearance 1.1
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
 // the application so all wxWindows code can safely assume that appearance 1.1

-// windows manager, control manager, navigation services etc. are 
+// windows manager, control manager, navigation services etc. are

 // present
 
 static bool    sUMAHasAppearance = false ;
 // present
 
 static bool    sUMAHasAppearance = false ;


@@ -79,7 +90,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 
     if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
         sUMASystemVersion = 0x0000 ;
 
     if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
         sUMASystemVersion = 0x0000 ;

-        
+

     long theAppearance ;
     if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
     {
     long theAppearance ;
     if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
     {


@@ -98,7 +109,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
     {
         sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
     }
     {
         sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
     }

-        
+

 #if TARGET_CARBON
 // Call currently implicitely done :        InitFloatingWindows() ;
 #else
 #if TARGET_CARBON
 // Call currently implicitely done :        InitFloatingWindows() ;
 #else


@@ -119,7 +130,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
     sUMAHasAquaLayout = true ;
 
   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
     sUMAHasAquaLayout = true ;
 
   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )

-  { 
+  {

     FontFamilyID fontId ;
     Str255 fontName ;
     SInt16 fontSize ;
     FontFamilyID fontId ;
     Str255 fontName ;
     SInt16 fontSize ;


@@ -132,7 +143,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
         { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
         { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;

-#if 0 // TARGET_CARBON  
+#if 0 // TARGET_CARBON

     --noOfFontDescriptions ;
 #endif
       // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
     --noOfFontDescriptions ;
 #endif
       // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke


@@ -160,12 +171,12 @@ Boolean CanUseATSUI()
     }
 */
 // process manager
     }
 */
 // process manager

-long UMAGetProcessMode() 
+long UMAGetProcessMode()

 {
 {

-    OSErr err ; 
+    OSErr err ;

     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;

-    
+

     procno.highLongOfPSN = NULL ;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     procno.highLongOfPSN = NULL ;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);


@@ -177,7 +188,7 @@ long UMAGetProcessMode()
     return processinfo.processMode ;
 }
 
     return processinfo.processMode ;
 }
 

-bool UMAGetProcessModeDoesActivateOnFGSwitch() 
+bool UMAGetProcessModeDoesActivateOnFGSwitch()

 {
     return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;
 }
 {
     return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;
 }


@@ -189,10 +200,8 @@ MenuRef UMANewMenu( SInt16 id , const wxString& title )
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;
 #if TARGET_CARBON
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;
 #if TARGET_CARBON

-    CFStringRef cfs = wxMacCreateCFString( str ) ;

     CreateNewMenu( id , 0 , &menu ) ;
     CreateNewMenu( id , 0 , &menu ) ;

-    SetMenuTitleWithCFString( menu , cfs ) ;
-    CFRelease( cfs ) ;
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;

 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;


@@ -205,9 +214,7 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title )
 {
     wxString str = wxStripMenuCodes( title ) ;
 #if TARGET_CARBON
 {
     wxString str = wxStripMenuCodes( title ) ;
 #if TARGET_CARBON

-    CFStringRef cfs = wxMacCreateCFString( str ) ;
-    SetMenuTitleWithCFString( menu , cfs ) ;
-    CFRelease( cfs ) ;
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;

 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;


@@ -215,13 +222,11 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title )
 #endif
 }
 
 #endif
 }
 

-void UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title ) 
+void UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title )

 {
     wxString str = wxStripMenuCodes( title ) ;
 #if TARGET_CARBON
 {
     wxString str = wxStripMenuCodes( title ) ;
 #if TARGET_CARBON

-    CFStringRef cfs = wxMacCreateCFString( str ) ;
-    SetMenuItemTextWithCFString( menu , item , cfs ) ;
-    CFRelease( cfs ) ;
+    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str) ) ;

 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;


@@ -235,7 +240,7 @@ UInt32 UMAMenuEvent( EventRecord *inEvent )
         return MenuEvent( inEvent ) ;
 }
 
         return MenuEvent( inEvent ) ;
 }
 

-void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) 
+void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)

 {
     if ( enable )
         EnableMenuItem( inMenu , inItem ) ;
 {
     if ( enable )
         EnableMenuItem( inMenu , inItem ) ;


@@ -243,14 +248,14 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
         DisableMenuItem( inMenu , inItem ) ;
 }
 
         DisableMenuItem( inMenu , inItem ) ;
 }
 

-void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 id ) 
+void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 id )

 {
     MacAppendMenu(menu, "\pA");
     UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
     SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 
 {
     MacAppendMenu(menu, "\pA");
     UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
     SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 

-void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 id  ) 
+void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 id  )

 {
     MacInsertMenuItem(menu, "\pA" , item);
     UMASetMenuItemText(menu, item , title );
 {
     MacInsertMenuItem(menu, "\pA" , item);
     UMASetMenuItemText(menu, item , title );


@@ -261,24 +266,24 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
 {
     if ( !entry )
         return ;
 {
     if ( !entry )
         return ;

-        
+

     UInt8 modifiers = 0 ;
     SInt16 key = entry->GetKeyCode() ;
     if ( key )
     {
         bool explicitCommandKey = false ;
 
     UInt8 modifiers = 0 ;
     SInt16 key = entry->GetKeyCode() ;
     if ( key )
     {
         bool explicitCommandKey = false ;
 

-        if ( entry->GetFlags() & wxACCEL_CTRL ) 
+        if ( entry->GetFlags() & wxACCEL_CTRL )

         {
             explicitCommandKey = true ;
         }
 
         {
             explicitCommandKey = true ;
         }
 

-        if (entry->GetFlags() & wxACCEL_ALT ) 
+        if (entry->GetFlags() & wxACCEL_ALT )

         {
             modifiers |= kMenuOptionModifier ;
         }
 
         {
             modifiers |= kMenuOptionModifier ;
         }
 

-        if (entry->GetFlags() & wxACCEL_SHIFT) 
+        if (entry->GetFlags() & wxACCEL_SHIFT)

         {
             modifiers |= kMenuShiftModifier ;
         }
         {
             modifiers |= kMenuShiftModifier ;
         }


@@ -287,68 +292,15 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         {
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         {

-            macKey = kFunctionKeyCharCode ;
+            // for some reasons this must be 0 right now
+            // everything else leads to just the first function key item
+            // to be selected. Thanks to Ryan Wilcox for finding out.
+            macKey = 0 ; 

             glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
             if ( key >= WXK_F13 )
                 glyph += 13 ;
             if ( !explicitCommandKey )
                 modifiers |= kMenuNoCommandModifier ;
             glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
             if ( key >= WXK_F13 )
                 glyph += 13 ;
             if ( !explicitCommandKey )
                 modifiers |= kMenuNoCommandModifier ;

-                
-            switch( key )
-            {
-                case WXK_F1 :
-                    macKey += ( 0x7a << 8 ) ;
-                    break ;
-                case WXK_F2 :
-                    macKey += ( 0x78 << 8 ) ;
-                    break ;
-                case WXK_F3 :
-                    macKey += ( 0x63 << 8 ) ;
-                    break ;
-                case WXK_F4 :
-                    macKey += ( 0x76 << 8 ) ;
-                    break ;
-                case WXK_F5 :
-                    macKey += ( 0x60 << 8 ) ;
-                    break ;
-                case WXK_F6 :
-                    macKey += ( 0x61 << 8 ) ;
-                    break ;
-                case WXK_F7 :
-                    macKey += ( 0x62 << 8 ) ;
-                    break ;
-                case WXK_F8 :
-                    macKey += ( 0x64 << 8 ) ;
-                    break ;
-                case WXK_F9 :
-                    macKey += ( 0x65 << 8 ) ;
-                    break ;
-                case WXK_F10 :
-                    macKey += ( 0x6D << 8 ) ;
-                    break ;
-                case WXK_F11 :
-                    macKey += ( 0x67 << 8 ) ;
-                    break ;
-                case WXK_F12 :
-                    macKey += ( 0x6F << 8 ) ;
-                    break ;
-                case WXK_F13 :
-                    macKey += ( 0x69 << 8 ) ;
-                    break ;
-                case WXK_F14 :
-                    macKey += ( 0x6B << 8 ) ;
-                    break ;
-                case WXK_F15 :
-                    macKey += ( 0x71 << 8 ) ;
-                    break ;
-                default :
-                    break ;
-            } ;
-            // unfortunately this does not yet trigger the right key ,
-            // for some reason mac justs picks the first function key menu
-            // defined, so we turn this off
-            macKey = 0 ;
-            glyph = 0 ;

           }
         else
         {
           }
         else
         {


@@ -421,27 +373,28 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
     }
 }
 
     }
 }
 

-void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry ) 
+void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry )

 {
     MacAppendMenu(menu, "\pA");
     UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
     UMASetMenuItemShortcut( menu ,  (SInt16) ::CountMenuItems(menu), entry ) ;
 }
 
 {
     MacAppendMenu(menu, "\pA");
     UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
     UMASetMenuItemShortcut( menu ,  (SInt16) ::CountMenuItems(menu), entry ) ;
 }
 

-void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry ) 
+void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry )

 {
 {

-    MacInsertMenuItem( menu , "\p" , item) ;
-    UMASetMenuItemText(menu, item , title );
-    UMASetMenuItemShortcut( menu , item , entry ) ;
+    MacInsertMenuItem( menu , "\pA" , item) ;
+    UMASetMenuItemText(menu, item+1 , title );
+    UMASetMenuItemShortcut( menu , item+1 , entry ) ;

 }
 
 // quickdraw
 
 }
 
 // quickdraw
 

+#if !TARGET_CARBON
+

 int gPrOpenCounter = 0 ;
 
 int gPrOpenCounter = 0 ;
 

-OSStatus UMAPrOpen(void *macPrintSession)
+OSStatus UMAPrOpen()

 {
 {

-#if !TARGET_CARBON

     OSErr err = noErr ;
     ++gPrOpenCounter ;
     if ( gPrOpenCounter == 1 )
     OSErr err = noErr ;
     ++gPrOpenCounter ;
     if ( gPrOpenCounter == 1 )


@@ -451,25 +404,10 @@ OSStatus UMAPrOpen(void *macPrintSession)
         wxASSERT( err == noErr ) ;
     }
     return err ;
         wxASSERT( err == noErr ) ;
     }
     return err ;

-#else
-    OSStatus err = noErr ;
-    ++gPrOpenCounter ;
-    if ( gPrOpenCounter == 1 )
-    {
-  #if PM_USE_SESSION_APIS
-        err = PMCreateSession((PMPrintSession *)macPrintSession) ;
-  #else
-        err = PMBegin() ;
-  #endif
-        wxASSERT( err == noErr ) ;
-    }
-    return err ;
-#endif

 }
 
 }
 

-OSStatus UMAPrClose(void *macPrintSession)
+OSStatus UMAPrClose()

 {
 {

-#if !TARGET_CARBON

     OSErr err = noErr ;
     wxASSERT( gPrOpenCounter >= 1 ) ;
     if ( gPrOpenCounter == 1 )
     OSErr err = noErr ;
     wxASSERT( gPrOpenCounter >= 1 ) ;
     if ( gPrOpenCounter == 1 )


@@ -480,25 +418,8 @@ OSStatus UMAPrClose(void *macPrintSession)
     }
     --gPrOpenCounter ;
     return err ;
     }
     --gPrOpenCounter ;
     return err ;

-#else
-    OSStatus err = noErr ;
-    wxASSERT( gPrOpenCounter >= 1 ) ;
-    if ( gPrOpenCounter == 1 )
-    {
-  #if PM_USE_SESSION_APIS
-        err = PMRelease(*(PMPrintSession *)macPrintSession) ;
-        *(PMPrintSession *)macPrintSession = kPMNoReference;
-  #else
-        err = PMEnd() ;
-  #endif
-    }
-    --gPrOpenCounter ;
-    return err ;
-#endif

 }
 
 }
 

-#if !TARGET_CARBON
-

 pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {
 pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {


@@ -507,7 +428,7 @@ pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 
 #endif
 
 
 #endif
 

-void UMAShowWatchCursor() 
+void UMAShowWatchCursor()

 {
     OSErr err = noErr;
 
 {
     OSErr err = noErr;
 


@@ -523,14 +444,14 @@ void UMAShowWatchCursor()
 //        SetQDGlobalsArrow (*watchFob);
 //        InitCursor ( );
 //        SetQDGlobalsArrow (&preservedArrow);
 //        SetQDGlobalsArrow (*watchFob);
 //        InitCursor ( );
 //        SetQDGlobalsArrow (&preservedArrow);

-        SetCursor (*watchFob);    
+        SetCursor (*watchFob);

     #else
     #else

-        SetCursor (*watchFob);    
+        SetCursor (*watchFob);

     #endif
     }
 }
 
     #endif
     }
 }
 

-void            UMAShowArrowCursor() 
+void            UMAShowArrowCursor()

 {
 #if TARGET_CARBON
     Cursor arrow;
 {
 #if TARGET_CARBON
     Cursor arrow;


@@ -542,36 +463,34 @@ void            UMAShowArrowCursor()
 
 // window manager
 
 
 // window manager
 

-GrafPtr        UMAGetWindowPort( WindowRef inWindowRef ) 
+GrafPtr        UMAGetWindowPort( WindowRef inWindowRef )

 {
     wxASSERT( inWindowRef != NULL ) ;
 {
     wxASSERT( inWindowRef != NULL ) ;

-#if TARGET_CARBON 
-    return (GrafPtr) GetWindowPort( inWindowRef ) ; 
+#if TARGET_CARBON
+    return (GrafPtr) GetWindowPort( inWindowRef ) ;

 #else
     return (GrafPtr) inWindowRef ;
 #endif
 }
 
 #else
     return (GrafPtr) inWindowRef ;
 #endif
 }
 

-void             UMADisposeWindow( WindowRef inWindowRef ) 
+void             UMADisposeWindow( WindowRef inWindowRef )

 {
     wxASSERT( inWindowRef != NULL ) ;
     DisposeWindow( inWindowRef ) ;
 }
 
 {
     wxASSERT( inWindowRef != NULL ) ;
     DisposeWindow( inWindowRef ) ;
 }
 

-void             UMASetWTitleC( WindowRef inWindowRef , const char *title ) 
+void UMASetWTitle( WindowRef inWindowRef , const wxString& title )

 {
 {

-    Str255    ptitle ;
-    strncpy( (char*)ptitle , title , 96 ) ;
-    ptitle[96] = 0 ;

 #if TARGET_CARBON
 #if TARGET_CARBON

-    c2pstrcpy( ptitle, (char *)ptitle ) ;
+    SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title) ) ;

 #else
 #else

-    c2pstr( (char*)ptitle ) ;
-#endif
+    Str255 ptitle ;
+    wxMacStringToPascal( title , ptitle ) ;

     SetWTitle( inWindowRef , ptitle ) ;
     SetWTitle( inWindowRef , ptitle ) ;

+#endif

 }
 
 }
 

-void             UMAGetWTitleC( WindowRef inWindowRef , char *title ) 
+void             UMAGetWTitleC( WindowRef inWindowRef , char *title )

 {
     GetWTitle( inWindowRef , (unsigned char*)title ) ;
 #if TARGET_CARBON
 {
     GetWTitle( inWindowRef , (unsigned char*)title ) ;
 #if TARGET_CARBON


@@ -583,7 +502,18 @@ void             UMAGetWTitleC( WindowRef inWindowRef , char *title )
 
 // appearance additions
 
 
 // appearance additions
 

-void UMAActivateControl( ControlHandle inControl ) 
+void UMASetControlTitle( ControlHandle inControl , const wxString& title )
+{
+#if TARGET_CARBON
+    SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ;
+#else
+    Str255 ptitle ;
+    wxMacStringToPascal( title , ptitle ) ;
+    SetControlTitle( inControl , ptitle ) ;
+#endif
+}
+
+void UMAActivateControl( ControlHandle inControl )

 {
     // we have to add the control after again to the update rgn
     // otherwise updates get lost
 {
     // we have to add the control after again to the update rgn
     // otherwise updates get lost


@@ -601,7 +531,7 @@ void UMAActivateControl( ControlHandle inControl )
     }
 }
 
     }
 }
 

-void UMADrawControl( ControlHandle inControl ) 
+void UMADrawControl( ControlHandle inControl )

 {
     WindowRef theWindow = GetControlOwner(inControl) ;
     RgnHandle updateRgn = NewRgn() ;
 {
     WindowRef theWindow = GetControlOwner(inControl) ;
     RgnHandle updateRgn = NewRgn() ;


@@ -614,7 +544,7 @@ void UMADrawControl( ControlHandle inControl )
     DisposeRgn( updateRgn ) ;
 }
 
     DisposeRgn( updateRgn ) ;
 }
 

-void UMAMoveControl( ControlHandle inControl , short x , short y ) 
+void UMAMoveControl( ControlHandle inControl , short x , short y )

 {
     bool visible = IsControlVisible( inControl ) ;
     if ( visible ) {
 {
     bool visible = IsControlVisible( inControl ) ;
     if ( visible ) {


@@ -630,14 +560,14 @@ void UMAMoveControl( ControlHandle inControl , short x , short y )
     }
 }
 
     }
 }
 

-void UMASizeControl( ControlHandle inControl , short x , short y ) 
+void UMASizeControl( ControlHandle inControl , short x , short y )

 {
     bool visible = IsControlVisible( inControl ) ;
     if ( visible ) {
         SetControlVisibility( inControl , false , false ) ;
         Rect ctrlBounds ;
         InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
 {
     bool visible = IsControlVisible( inControl ) ;
     if ( visible ) {
         SetControlVisibility( inControl , false , false ) ;
         Rect ctrlBounds ;
         InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;

-    } 
+    }

     ::SizeControl( inControl , x , y ) ;
     if ( visible ) {
         SetControlVisibility( inControl , true , false ) ;
     ::SizeControl( inControl , x , y ) ;
     if ( visible ) {
         SetControlVisibility( inControl , true , false ) ;


@@ -646,7 +576,7 @@ void UMASizeControl( ControlHandle inControl , short x , short y )
     }
 }
 
     }
 }
 

-void UMADeactivateControl( ControlHandle inControl ) 
+void UMADeactivateControl( ControlHandle inControl )

 {
     // we have to add the control after again to the update rgn
     // otherwise updates get lost
 {
     // we have to add the control after again to the update rgn
     // otherwise updates get lost


@@ -693,32 +623,32 @@ OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
 
 
 // events
 
 
 // events

-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
+void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )

 {
     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( inWindow , updateRgn ) ;
 {
     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( inWindow , updateRgn ) ;

-    
+

     Point zero = { 0 , 0 } ;
     LocalToGlobal( &zero ) ;
     OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
     Point zero = { 0 , 0 } ;
     LocalToGlobal( &zero ) ;
     OffsetRgn( updateRgn , -zero.h , -zero.v ) ;

-    
+

     UpdateControls( inWindow , inRgn ) ;
     InvalWindowRgn( inWindow, updateRgn) ;
     DisposeRgn( updateRgn ) ;
 }
 
     UpdateControls( inWindow , inRgn ) ;
     InvalWindowRgn( inWindow, updateRgn) ;
     DisposeRgn( updateRgn ) ;
 }
 

-bool UMAIsWindowFloating( WindowRef inWindow ) 
+bool UMAIsWindowFloating( WindowRef inWindow )

 {
     WindowClass cl ;
 {
     WindowClass cl ;

-    
+

     GetWindowClass( inWindow , &cl ) ;
     return cl == kFloatingWindowClass ;
 }
 
     GetWindowClass( inWindow , &cl ) ;
     return cl == kFloatingWindowClass ;
 }
 

-bool UMAIsWindowModal( WindowRef inWindow ) 
+bool UMAIsWindowModal( WindowRef inWindow )

 {
     WindowClass cl ;
 {
     WindowClass cl ;

-    
+

     GetWindowClass( inWindow , &cl ) ;
     return cl < kFloatingWindowClass ;
 }
     GetWindowClass( inWindow , &cl ) ;
     return cl < kFloatingWindowClass ;
 }


@@ -743,12 +673,12 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
                 UMAActivateControl( control ) ;
             else
                 UMADeactivateControl( control ) ;
                 UMAActivateControl( control ) ;
             else
                 UMADeactivateControl( control ) ;

-        }    
+        }

         SetPort( port ) ;
     }
 }
 
         SetPort( port ) ;
     }
 }
 

-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) 
+OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )

 {
     return ::DrawThemePlacard( inRect , inState ) ;
 }
 {
     return ::DrawThemePlacard( inRect , inState ) ;
 }


@@ -780,7 +710,7 @@ OSStatus UMAGetHelpMenu(
 #endif
 }
 
 #endif
 }
 

-wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport) 
+wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport)

 {
     m_clip = NULL ;
     Setup( newport ) ;
 {
     m_clip = NULL ;
     Setup( newport ) ;


@@ -795,13 +725,13 @@ void wxMacPortStateHelper::Setup( GrafPtr newport )
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;

-    wxASSERT_MSG( m_clip == NULL , "Cannot call setup twice" ) ;
+    wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;

     m_clip = NewRgn() ;
     GetClip( m_clip );
     m_textFont = GetPortTextFont( (CGrafPtr) newport);
     m_textSize = GetPortTextSize( (CGrafPtr) newport);
     m_textStyle = GetPortTextFace( (CGrafPtr) newport);
     m_clip = NewRgn() ;
     GetClip( m_clip );
     m_textFont = GetPortTextFont( (CGrafPtr) newport);
     m_textSize = GetPortTextSize( (CGrafPtr) newport);
     m_textStyle = GetPortTextFace( (CGrafPtr) newport);

-    m_textMode = GetPortTextMode( (CGrafPtr) newport);    
+    m_textMode = GetPortTextMode( (CGrafPtr) newport);

     GetThemeDrawingState( &m_drawingState ) ;
     m_currentPort = newport ;
 }
     GetThemeDrawingState( &m_drawingState ) ;
     m_currentPort = newport ;
 }


@@ -838,7 +768,7 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data )
     err = PutScrap( size , type , data ) ;
 #else
     ScrapRef    scrap;
     err = PutScrap( size , type , data ) ;
 #else
     ScrapRef    scrap;

-    err = GetCurrentScrap (&scrap); 
+    err = GetCurrentScrap (&scrap);

     if ( !err )
     {
         err = PutScrapFlavor (scrap, type , 0, size, data);
     if ( !err )
     {
         err = PutScrapFlavor (scrap, type , 0, size, data);