test for valid icon

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index c8073ac49f4df870375ad8bf425a2d62b488edae..47a6fb92c8ac7da84a0ef1559b66ccdaa7f79c3b 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        uma.cpp
+// Name:        src/mac/carbon/uma.cpp

 // Purpose:     UMA support
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     UMA support
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,235 +9,82 @@
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
-#include "wx/dc.h"
-#include <MacTextEditor.h>
-
-#ifndef __DARWIN__
-#  include <Navigation.h>
-#  if defined(TARGET_CARBON)
-#    if PM_USE_SESSION_APIS
-#      include <PMCore.h>
-#    endif
-#    include <PMApplication.h>
-#  else
-#    include <Printing.h>
-#  endif
-#endif
+#include "wx/wxprec.h"

 
 

-#ifndef __DARWIN__
-#include <Scrap.h>
-#endif

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

-// 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
-// present
-
-static bool    sUMAHasAppearance = false ;
-static long sUMAAppearanceVersion = 0 ;
-static long sUMASystemVersion = 0 ;
-static bool sUMAHasAquaLayout = false ;
-static bool sUMASystemInitialized = false ;
+#if wxUSE_GUI

 
 

-extern int gAGABackgroundColor ;
-bool UMAHasAppearance() { return sUMAHasAppearance ; }
-long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
-long UMAGetSystemVersion() { return sUMASystemVersion ; }
+#include "wx/toplevel.h"
+#include "wx/dc.h"

 
 

-static bool    sUMAHasWindowManager = false ;
-static long sUMAWindowManagerAttr = 0 ;
+#include "wx/mac/uma.h"

 
 

-bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
-long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
-bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
-bool UMASystemIsInitialized() { return sUMASystemInitialized ; }
+static SInt32 sUMASystemVersion = 0 ;

 
 

-void UMACleanupToolbox()
-{
-    if ( sUMAHasAppearance )
+long UMAGetSystemVersion() 
+{ 
+    if ( sUMASystemVersion == 0 )

     {
     {

-        UnregisterAppearanceClient() ;
+        verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));

     }
     }

-    if ( NavServicesAvailable() )
-    {
-        NavUnload() ;
-    }
-  if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
-      TXNTerminateTextension( ) ;
+    return sUMASystemVersion ; 

 }
 }

-void UMAInitToolbox( UInt16 inMoreMastersCalls )
+
+void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls),
+                     bool WXUNUSED(isEmbedded) )

 {
 {

-#if !TARGET_CARBON
-    ::MaxApplZone();
-    for (long i = 1; i <= inMoreMastersCalls; i++)
-        ::MoreMasters();
-
-    ::InitGraf(&qd.thePort);
-    ::InitFonts();
-    ::InitMenus();
-    ::TEInit();
-    ::InitDialogs(0L);
-    ::FlushEvents(everyEvent, 0);
-    ::InitCursor();
-    long total,contig;
-    PurgeSpace(&total, &contig);
-#else
-    InitCursor();
-#endif
+#if 0 // ndef __LP64__
+    {
+        FontFamilyID fontId ;
+        Str255 fontName ;
+        SInt16 fontSize ;
+        Style fontStyle ;

 
 

-    if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
-        sUMASystemVersion = 0x0000 ;
+        GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+        GetFNum( fontName, &fontId );

 
 

-    long theAppearance ;
-    if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
-    {
-        sUMAHasAppearance = true ;
-        RegisterAppearanceClient();
-        if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
+        TXNMacOSPreferredFontDescription fontDescriptions[] =

         {
         {

-            sUMAAppearanceVersion = theAppearance ;
-        }
-        else
-        {
-            sUMAAppearanceVersion = 0x0100 ;
-        }
-    }
-    if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
-    {
-        sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
-    }
+            { fontId , (fontSize << 16) , kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
+        } ;
+        int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;

 
 

-#if TARGET_CARBON
-// Call currently implicitely done :        InitFloatingWindows() ;
-#else
-    if ( sUMAHasWindowManager )
-        InitFloatingWindows() ;
-    else
-        InitWindows();
-#endif
+        OptionBits options = 0 ;

 
 

-    if ( NavServicesAvailable() )
-    {
-        NavLoad() ;
+        TXNInitTextension( fontDescriptions,  noOfFontDescriptions, options );

     }
     }

-
-  long menuMgrAttr ;
-  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
-  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
-    sUMAHasAquaLayout = true ;
-
-  if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
-  {
-    FontFamilyID fontId ;
-    Str255 fontName ;
-    SInt16 fontSize ;
-    Style fontStyle ;
-    GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
-    GetFNum( fontName, &fontId );
-
-    TXNMacOSPreferredFontDescription fontDescriptions[] =
-    {
-        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
-    } ;
-    int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
-#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
-      OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
-#if TARGET_CARBON
-    if ( !UMAHasAquaLayout() )

 #endif
 #endif

-    {
-        options |= kTXNAlwaysUseQuickDrawTextMask ;
-    }
-      TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
-  }
-
-
-  sUMASystemInitialized = true ;
-
-}
-
-/*
-Boolean CanUseATSUI()
-    {
-    long result;
-    OSErr err = Gestalt(gestaltATSUVersion, &result);
-    return (err == noErr);
-    }
-*/
-// process manager
-long UMAGetProcessMode()
-{
-    OSErr err ;
-    ProcessInfoRec processinfo;
-    ProcessSerialNumber procno ;
-
-    procno.highLongOfPSN = NULL ;
-    procno.lowLongOfPSN = kCurrentProcess ;
-    processinfo.processInfoLength = sizeof(ProcessInfoRec);
-    processinfo.processName = NULL;
-    processinfo.processAppSpec = NULL;
-
-    err = ::GetProcessInformation( &procno , &processinfo ) ;
-    wxASSERT( err == noErr ) ;
-    return processinfo.processMode ;
-}
-
-bool UMAGetProcessModeDoesActivateOnFGSwitch()
-{
-    return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;

 }
 
 // menu manager
 
 }
 
 // menu manager
 

-MenuRef UMANewMenu( SInt16 id , const wxString& title )
+#if wxMAC_USE_COCOA == 0
+
+MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding )

 {
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;
 {
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;

-#if TARGET_CARBON
+

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

-    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( str , ptitle ) ;
-    menu = ::NewMenu( id , ptitle ) ;
-#endif
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
+

     return menu ;
 }
 
     return menu ;
 }
 

-void UMASetMenuTitle( MenuRef menu , const wxString& title )
+void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding )

 {
     wxString str = wxStripMenuCodes( title ) ;
 {
     wxString str = wxStripMenuCodes( title ) ;

-#if TARGET_CARBON
-    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( str , ptitle ) ;
-    SetMenuTitle( menu , ptitle ) ;
-#endif
-}

 
 

-void UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title )
-{
-    wxString str = wxStripMenuCodes( title ) ;
-#if TARGET_CARBON
-    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str) ) ;
-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( str , ptitle ) ;
-    SetMenuItemText( menu , item , ptitle ) ;
-#endif
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;

 }
 
 }
 

-
-UInt32 UMAMenuEvent( EventRecord *inEvent )
+void UMASetMenuItemText( MenuRef menu,  MenuItemIndex item, const wxString& title, wxFontEncoding encoding )

 {
 {

-        return MenuEvent( inEvent ) ;
+    // we don't strip the accels here anymore, must be done before
+    wxString str = title ;
+
+    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;

 }
 
 void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
 }
 
 void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)


@@ -248,18 +95,21 @@ 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, wxFontEncoding encoding , SInt16 id )

 {
 {

-    MacAppendMenu(menu, "\pA");
-    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+    AppendMenuItemTextWithCFString( menu,
+                                CFSTR("A"), 0, 0,NULL);
+    UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding );

     SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 
     SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 

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

 {
 {

-    MacInsertMenuItem(menu, "\pA" , item);
-    UMASetMenuItemText(menu, item , title );
-    SetMenuItemHierarchicalID( menu , item , id ) ;
+    InsertMenuItemTextWithCFString( menu,
+                CFSTR("A"), item, 0, 0);
+
+    UMASetMenuItemText( menu, item+1, title , encoding );
+    SetMenuItemHierarchicalID( menu , item+1 , id ) ;

 }
 
 void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
 }
 
 void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )


@@ -271,509 +121,196 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
     SInt16 key = entry->GetKeyCode() ;
     if ( key )
     {
     SInt16 key = entry->GetKeyCode() ;
     if ( key )
     {

-        bool explicitCommandKey = false ;
+        bool explicitCommandKey = (entry->GetFlags() & wxACCEL_CTRL);

 
 

-        if ( entry->GetFlags() & wxACCEL_CTRL )
-        {
-            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 ;

-        }

 
         SInt16 glyph = 0 ;
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         {
 
         SInt16 glyph = 0 ;
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         {

+            if ( !explicitCommandKey )
+                modifiers |= kMenuNoCommandModifier ;
+

             // 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.
             // 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 ; 
+            macKey = 0 ;

             glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
             if ( key >= WXK_F13 )
             glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
             if ( key >= WXK_F13 )

-                glyph += 13 ;
-            if ( !explicitCommandKey )
-                modifiers |= kMenuNoCommandModifier ;
-          }
+                glyph += 12 ;
+        }

         else
         {
         else
         {

-            switch( key )
+            switch ( key )

             {
                 case WXK_BACK :
                     macKey = kBackspaceCharCode ;
                     glyph = kMenuDeleteLeftGlyph ;
                     break ;
             {
                 case WXK_BACK :
                     macKey = kBackspaceCharCode ;
                     glyph = kMenuDeleteLeftGlyph ;
                     break ;

+

                 case WXK_TAB :
                     macKey = kTabCharCode ;
                     glyph = kMenuTabRightGlyph ;
                     break ;
                 case WXK_TAB :
                     macKey = kTabCharCode ;
                     glyph = kMenuTabRightGlyph ;
                     break ;

+

                 case kEnterCharCode :
                     macKey = kEnterCharCode ;
                     glyph = kMenuEnterGlyph ;
                     break ;
                 case kEnterCharCode :
                     macKey = kEnterCharCode ;
                     glyph = kMenuEnterGlyph ;
                     break ;

+

                 case WXK_RETURN :
                     macKey = kReturnCharCode ;
                     glyph = kMenuReturnGlyph ;
                     break ;
                 case WXK_RETURN :
                     macKey = kReturnCharCode ;
                     glyph = kMenuReturnGlyph ;
                     break ;

+

                 case WXK_ESCAPE :
                     macKey = kEscapeCharCode ;
                     glyph = kMenuEscapeGlyph ;
                     break ;
                 case WXK_ESCAPE :
                     macKey = kEscapeCharCode ;
                     glyph = kMenuEscapeGlyph ;
                     break ;

+

                 case WXK_SPACE :
                     macKey = ' ' ;
                     glyph = kMenuSpaceGlyph ;
                     break ;
                 case WXK_SPACE :
                     macKey = ' ' ;
                     glyph = kMenuSpaceGlyph ;
                     break ;

+

                 case WXK_DELETE :
                     macKey = kDeleteCharCode ;
                     glyph = kMenuDeleteRightGlyph ;
                     break ;
                 case WXK_DELETE :
                     macKey = kDeleteCharCode ;
                     glyph = kMenuDeleteRightGlyph ;
                     break ;

+

                 case WXK_CLEAR :
                     macKey = kClearCharCode ;
                     glyph = kMenuClearGlyph ;
                     break ;
                 case WXK_CLEAR :
                     macKey = kClearCharCode ;
                     glyph = kMenuClearGlyph ;
                     break ;

-                case WXK_PRIOR : // PAGE UP
+
+                case WXK_PAGEUP :

                     macKey = kPageUpCharCode ;
                     glyph = kMenuPageUpGlyph ;
                     break ;
                     macKey = kPageUpCharCode ;
                     glyph = kMenuPageUpGlyph ;
                     break ;

-                case WXK_NEXT :
+
+                case WXK_PAGEDOWN :

                     macKey = kPageDownCharCode ;
                     glyph = kMenuPageDownGlyph ;
                     break ;
                     macKey = kPageDownCharCode ;
                     glyph = kMenuPageDownGlyph ;
                     break ;

+

                 case WXK_LEFT :
                     macKey = kLeftArrowCharCode ;
                     glyph = kMenuLeftArrowGlyph ;
                     break ;
                 case WXK_LEFT :
                     macKey = kLeftArrowCharCode ;
                     glyph = kMenuLeftArrowGlyph ;
                     break ;

+

                 case WXK_UP :
                     macKey = kUpArrowCharCode ;
                     glyph = kMenuUpArrowGlyph ;
                     break ;
                 case WXK_UP :
                     macKey = kUpArrowCharCode ;
                     glyph = kMenuUpArrowGlyph ;
                     break ;

+

                 case WXK_RIGHT :
                     macKey = kRightArrowCharCode ;
                     glyph = kMenuRightArrowGlyph ;
                     break ;
                 case WXK_RIGHT :
                     macKey = kRightArrowCharCode ;
                     glyph = kMenuRightArrowGlyph ;
                     break ;

+

                 case WXK_DOWN :
                     macKey = kDownArrowCharCode ;
                     glyph = kMenuDownArrowGlyph ;
                     break ;
                 case WXK_DOWN :
                     macKey = kDownArrowCharCode ;
                     glyph = kMenuDownArrowGlyph ;
                     break ;

-            }
-        }
-
-        SetItemCmd( menu, item , macKey );
-        SetMenuItemModifiers(menu, item , modifiers ) ;
-
-        if ( glyph )
-            SetMenuItemKeyGlyph(menu, item , glyph ) ;
-    }
-}
-
-void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *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 )
-{
-    MacInsertMenuItem( menu , "\pA" , item) ;
-    UMASetMenuItemText(menu, item+1 , title );
-    UMASetMenuItemShortcut( menu , item+1 , entry ) ;
-}
-
-// quickdraw
-
-#if !TARGET_CARBON
-
-int gPrOpenCounter = 0 ;
-
-OSStatus UMAPrOpen()
-{
-    OSErr err = noErr ;
-    ++gPrOpenCounter ;
-    if ( gPrOpenCounter == 1 )
-    {
-        PrOpen() ;
-        err = PrError() ;
-        wxASSERT( err == noErr ) ;
-    }
-    return err ;
-}
-
-OSStatus UMAPrClose()
-{
-    OSErr err = noErr ;
-    wxASSERT( gPrOpenCounter >= 1 ) ;
-    if ( gPrOpenCounter == 1 )
-    {
-        PrClose() ;
-        err = PrError() ;
-        wxASSERT( err == noErr ) ;
-    }
-    --gPrOpenCounter ;
-    return err ;
-}
-
-pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
-pascal QDGlobalsPtr GetQDGlobalsPtr (void)
-{
-    return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
-}
-
-#endif
-
-void UMAShowWatchCursor()
-{
-    OSErr err = noErr;
-
-    CursHandle watchFob = GetCursor (watchCursor);

 
 

-    if (!watchFob)
-        err = nilHandleErr;
-    else
-    {
-    #if TARGET_CARBON
-//        Cursor preservedArrow;
-//        GetQDGlobalsArrow (&preservedArrow);
-//        SetQDGlobalsArrow (*watchFob);
-//        InitCursor ( );
-//        SetQDGlobalsArrow (&preservedArrow);
-        SetCursor (*watchFob);
-    #else
-        SetCursor (*watchFob);
-    #endif
-    }
-}
-
-void            UMAShowArrowCursor()
-{
-#if TARGET_CARBON
-    Cursor arrow;
-    SetCursor (GetQDGlobalsArrow (&arrow));
-#else
-    SetCursor (&(qd.arrow));
-#endif
-}
-
-// window manager
-
-GrafPtr        UMAGetWindowPort( WindowRef inWindowRef )
-{
-    wxASSERT( inWindowRef != NULL ) ;
-#if TARGET_CARBON
-    return (GrafPtr) GetWindowPort( inWindowRef ) ;
-#else
-    return (GrafPtr) inWindowRef ;
-#endif
-}
-
-void             UMADisposeWindow( WindowRef inWindowRef )
-{
-    wxASSERT( inWindowRef != NULL ) ;
-    DisposeWindow( inWindowRef ) ;
-}
-
-void UMASetWTitle( WindowRef inWindowRef , const wxString& title )
-{
-#if TARGET_CARBON
-    SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title) ) ;
-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( title , ptitle ) ;
-    SetWTitle( inWindowRef , ptitle ) ;
-#endif
-}
-
-void             UMAGetWTitleC( WindowRef inWindowRef , char *title )
-{
-    GetWTitle( inWindowRef , (unsigned char*)title ) ;
-#if TARGET_CARBON
-    p2cstrcpy( title, (unsigned char *)title ) ;
-#else
-    p2cstr( (unsigned char*)title ) ;
-#endif
-}
-
-// appearance additions
+                case WXK_HOME :
+                    macKey = kHomeCharCode ;
+                    glyph = kMenuNorthwestArrowGlyph ;
+                    break ;

 
 

-void UMASetControlTitle( ControlHandle inControl , const wxString& title )
-{
-#if TARGET_CARBON
-    SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ;
-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( title , ptitle ) ;
-    SetControlTitle( inControl , ptitle ) ;
-#endif
-}
+                case WXK_END :
+                    macKey = kEndCharCode ;
+                    glyph = kMenuSoutheastArrowGlyph ;
+                    break ;
+                default :
+                    macKey = toupper( key ) ;
+                    break ;
+            }

 
 

-void UMAActivateControl( ControlHandle inControl )
-{
-    // we have to add the control after again to the update rgn
-    // otherwise updates get lost
-    if ( !IsControlActive( inControl ) )
-    {
-        bool visible = IsControlVisible( inControl ) ;
-        if ( visible )
-            SetControlVisibility( inControl , false , false ) ;
-        ::ActivateControl( inControl ) ;
-        if ( visible ) {
-            SetControlVisibility( inControl , true , false ) ;
-            Rect ctrlBounds ;
-            InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+            // we now allow non command key shortcuts
+            // remove in case this gives problems
+            if ( !explicitCommandKey )
+                modifiers |= kMenuNoCommandModifier ;

         }
         }

-    }
-}

 
 

-void UMADrawControl( ControlHandle inControl )
-{
-    WindowRef theWindow = GetControlOwner(inControl) ;
-    RgnHandle updateRgn = NewRgn() ;
-    GetWindowUpdateRgn( theWindow , updateRgn ) ;
-    Point zero = { 0 , 0 } ;
-    LocalToGlobal( &zero ) ;
-    OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
-    ::DrawControlInCurrentPort( inControl ) ;
-    InvalWindowRgn( theWindow, updateRgn) ;
-    DisposeRgn( updateRgn ) ;
-}
+        // 1d and 1e have special meaning to SetItemCmd, so
+        // do not use for these character codes.
+        if (key != WXK_UP && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_LEFT)
+            SetItemCmd( menu, item , macKey );

 
 

-void UMAMoveControl( ControlHandle inControl , short x , short y )
-{
-    bool visible = IsControlVisible( inControl ) ;
-    if ( visible ) {
-        SetControlVisibility( inControl , false , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
-    }
-    ::MoveControl( inControl , x , y ) ;
-    if ( visible ) {
-        SetControlVisibility( inControl , true , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
-    }
-}
+        SetMenuItemModifiers( menu, item , modifiers ) ;

 
 

-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) ) ;
-    }
-    ::SizeControl( inControl , x , y ) ;
-    if ( visible ) {
-        SetControlVisibility( inControl , true , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
-    }
-}
-
-void UMADeactivateControl( ControlHandle inControl )
-{
-    // we have to add the control after again to the update rgn
-    // otherwise updates get lost
-    bool visible = IsControlVisible( inControl ) ;
-    if ( visible )
-        SetControlVisibility( inControl , false , false ) ;
-    ::DeactivateControl( inControl ) ;
-    if ( visible ) {
-        SetControlVisibility( inControl , true , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        if ( glyph )
+            SetMenuItemKeyGlyph( menu, item , glyph ) ;

     }
 }
     }
 }

-// shows the control and adds the region to the update region
-void UMAShowControl                        (ControlHandle             inControl)
-{
-    SetControlVisibility( inControl , true , false ) ;
-    Rect ctrlBounds ;
-    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
-}
-
-// shows the control and adds the region to the update region
-void UMAHideControl                        (ControlHandle             inControl)
-{
-    SetControlVisibility( inControl , false , false ) ;
-    Rect ctrlBounds ;
-    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
-}
-// keyboard focus
-OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
-                                 ControlHandle             inControl,
-                                 ControlFocusPart         inPart)
-{
-    OSErr err = noErr;
-    GrafPtr port ;
-    GetPort( &port ) ;
-
-    SetPortWindowPort( inWindow ) ;
-
-    err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
-    SetPort( port ) ;
-    return err ;
-}
-

 
 

-// events
-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
+void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )

 {
 {

-    RgnHandle updateRgn = NewRgn() ;
-    GetWindowUpdateRgn( inWindow , updateRgn ) ;
-
-    Point zero = { 0 , 0 } ;
-    LocalToGlobal( &zero ) ;
-    OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
-
-    UpdateControls( inWindow , inRgn ) ;
-    InvalWindowRgn( inWindow, updateRgn) ;
-    DisposeRgn( updateRgn ) ;
+    AppendMenuItemTextWithCFString( menu,
+                                CFSTR("A"), 0, 0,NULL);
+    // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
+    ChangeMenuItemAttributes( menu , ::CountMenuItems(menu), kMenuItemAttrIgnoreMeta , 0 ) ;
+    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
+    UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ;

 }
 
 }
 

-bool UMAIsWindowFloating( WindowRef inWindow )
+void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )

 {
 {

-    WindowClass cl ;
+    InsertMenuItemTextWithCFString( menu,
+                CFSTR("A"), item, 0, 0);

 
 

-    GetWindowClass( inWindow , &cl ) ;
-    return cl == kFloatingWindowClass ;
+    // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
+    ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ;
+    UMASetMenuItemText(menu, item+1 , title , encoding );
+    UMASetMenuItemShortcut( menu , item+1 , entry ) ;

 }
 
 }
 

-bool UMAIsWindowModal( WindowRef inWindow )
-{
-    WindowClass cl ;
+#endif

 
 

-    GetWindowClass( inWindow , &cl ) ;
-    return cl < kFloatingWindowClass ;
-}
+#if wxMAC_USE_COCOA == 0

 
 

-// others
+static OSStatus UMAGetHelpMenu(
+                               MenuRef *        outHelpMenu,
+                               MenuItemIndex *  outFirstCustomItemIndex,
+                               bool             allowHelpMenuCreation);

 
 

-void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
+static OSStatus UMAGetHelpMenu(
+                               MenuRef *        outHelpMenu,
+                               MenuItemIndex *  outFirstCustomItemIndex,
+                               bool             allowHelpMenuCreation)

 {
 {

-    if ( inWindowRef )
+    static bool s_createdHelpMenu = false ;
+    
+    if ( !s_createdHelpMenu && !allowHelpMenuCreation )

     {
     {

-//        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
-//        if ( inActivate != isHightlited )
-        GrafPtr port ;
-        GetPort( &port ) ;
-        SetPortWindowPort( inWindowRef ) ;
-        HiliteWindow( inWindowRef , inActivate ) ;
-        ControlHandle control = NULL ;
-        ::GetRootControl( inWindowRef , & control ) ;
-        if ( control )
-        {
-            if ( inActivate )
-                UMAActivateControl( control ) ;
-            else
-                UMADeactivateControl( control ) ;
-        }
-        SetPort( port ) ;
+        return paramErr ;

     }
     }

+    
+    OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
+    s_createdHelpMenu = ( status == noErr ) ;
+    return status ;

 }
 
 }
 

-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
-{
-    return ::DrawThemePlacard( inRect , inState ) ;
-}
-
-#if !TARGET_CARBON
-static OSStatus helpMenuStatus = noErr ;
-static MenuItemIndex firstCustomItemIndex = 0 ;
-#endif
-

 OSStatus UMAGetHelpMenu(
 OSStatus UMAGetHelpMenu(

-  MenuRef *        outHelpMenu,
-  MenuItemIndex *  outFirstCustomItemIndex)
-{
-#if TARGET_CARBON
-    return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
-#else
-    MenuRef helpMenuHandle ;
-    helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
-    if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
-    {
-        firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
-    }
-    if ( outFirstCustomItemIndex )
-    {
-        *outFirstCustomItemIndex = firstCustomItemIndex ;
-    }
-    *outHelpMenu = helpMenuHandle ;
-    return helpMenuStatus ;
-#endif
-}
-
-wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport)
-{
-    m_clip = NULL ;
-    Setup( newport ) ;
-}
-
-wxMacPortStateHelper::wxMacPortStateHelper()
+                        MenuRef *        outHelpMenu,
+                        MenuItemIndex *  outFirstCustomItemIndex)

 {
 {

-    m_clip = NULL ;
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , true );

 }
 
 }
 

-void wxMacPortStateHelper::Setup( GrafPtr newport )
+OSStatus UMAGetHelpMenuDontCreate(
+                                  MenuRef *        outHelpMenu,
+                                  MenuItemIndex *  outFirstCustomItemIndex)

 {
 {

-    GetPort( &m_oldPort ) ;
-    SetPort( newport ) ;
-    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_textMode = GetPortTextMode( (CGrafPtr) newport);
-    GetThemeDrawingState( &m_drawingState ) ;
-    m_currentPort = newport ;
-}
-void wxMacPortStateHelper::Clear()
-{
-    if ( m_clip )
-    {
-        DisposeRgn( m_clip ) ;
-        DisposeThemeDrawingState( m_drawingState ) ;
-        m_clip = NULL ;
-    }
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , false );

 }
 
 }
 

-wxMacPortStateHelper::~wxMacPortStateHelper()
-{
-    if ( m_clip )
-    {
-        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 ) ;
-    }
-}
-
-OSStatus UMAPutScrap( Size size , OSType type , void *data )
-{
-    OSStatus err = noErr ;
-#if !TARGET_CARBON
-    err = PutScrap( size , type , data ) ;
-#else
-    ScrapRef    scrap;
-    err = GetCurrentScrap (&scrap);
-    if ( !err )
-    {
-        err = PutScrapFlavor (scrap, type , 0, size, data);
-    }

 #endif
 #endif

-    return err ;
-}

 
 

+#endif  // wxUSE_GUI