X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c3c58491844c139aed733a654cdd823bd1e9c5f..b1a1a83c929126a9183a7e1f93646484bbd95b1b:/src/mac/carbon/uma.cpp?ds=sidebyside diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 43e9cf7e44..93fc8225ee 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -1,8 +1,22 @@ -#include "wx/defs.h" +///////////////////////////////////////////////////////////////////////////// +// 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/wxprec.h" + +#if wxUSE_GUI + #include "wx/dc.h" -#include #ifndef __DARWIN__ +# include # include # if defined(TARGET_CARBON) # if PM_USE_SESSION_APIS @@ -19,740 +33,712 @@ #endif #include "wx/mac/uma.h" +#if TARGET_API_MAC_OSX +#include "wx/toplevel.h" +#endif + // 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 +// the application so all wxWidgets code can safely assume that appearance 1.1 +// windows manager, control manager, navigation services etc. are // present -static bool sUMAHasAppearance = false ; +static bool sUMAHasAppearance = false ; static long sUMAAppearanceVersion = 0 ; static long sUMASystemVersion = 0 ; static bool sUMAHasAquaLayout = false ; -static bool sUMASystemInitialized = false ; + +static bool sUMAHasInittedAppearance = false; extern int gAGABackgroundColor ; + bool UMAHasAppearance() { return sUMAHasAppearance ; } long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; } long UMAGetSystemVersion() { return sUMASystemVersion ; } -static bool sUMAHasWindowManager = false ; +static bool sUMAHasWindowManager = false ; static long sUMAWindowManagerAttr = 0 ; bool UMAHasWindowManager() { return sUMAHasWindowManager ; } long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; } bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; } -bool UMASystemIsInitialized() { return sUMASystemInitialized ; } + void UMACleanupToolbox() { - if ( sUMAHasAppearance ) - { - UnregisterAppearanceClient() ; - } - if ( NavServicesAvailable() ) - { - NavUnload() ; - } + if (sUMAHasInittedAppearance) + UnregisterAppearanceClient() ; + + if ( NavServicesAvailable() ) + NavUnload() ; + if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress ) - TXNTerminateTextension( ) ; + TXNTerminateTextension( ) ; } -void UMAInitToolbox( UInt16 inMoreMastersCalls ) + +void UMAInitToolbox( UInt16 inMoreMastersCalls, bool 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(); + ::MaxApplZone(); + for (long i = 1; i <= inMoreMastersCalls; i++) + ::MoreMasters(); + + if (!isEmbedded) + { + ::InitGraf(&qd.thePort); + ::InitFonts(); + ::InitMenus(); + ::TEInit(); + ::InitDialogs(0L); + ::FlushEvents(everyEvent, 0); + } + + long total,contig; + PurgeSpace(&total, &contig); #endif + ::InitCursor(); + if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr) - sUMASystemVersion = 0x0000 ; - - long theAppearance ; - if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr ) - { - sUMAHasAppearance = true ; - RegisterAppearanceClient(); - if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr ) - { - sUMAAppearanceVersion = theAppearance ; - } - else - { - sUMAAppearanceVersion = 0x0100 ; - } - } - if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr ) - { - sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ; - } - -#if TARGET_CARBON -// Call currently implicitely done : InitFloatingWindows() ; -#else - if ( sUMAHasWindowManager ) - InitFloatingWindows() ; - else - InitWindows(); -#endif + sUMASystemVersion = 0x0000 ; - if ( NavServicesAvailable() ) - { - NavLoad() ; - } - - 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[] = + long theAppearance ; + if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr ) { - { 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 status equals appearanceProcessRegisteredErr it means the + // appearance client already was registered (For example if we run + // embedded, the host might have registered it). In such a case + // we don't unregister it later on. + + sUMAHasAppearance = true ; + OSStatus status = RegisterAppearanceClient(); + if (status != appearanceProcessRegisteredErr) + { + // Appearance client wasn't registered yet. + sUMAHasInittedAppearance = true; + } + + if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr ) + sUMAAppearanceVersion = theAppearance ; + else + sUMAAppearanceVersion = 0x0100 ; + } + + if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr ) + sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ; + #if TARGET_CARBON - if ( !UMAHasAquaLayout() ) -#endif +// Call currently implicitely done : InitFloatingWindows() ; +#else + if (!isEmbedded) { - options |= kTXNAlwaysUseQuickDrawTextMask ; + if ( sUMAHasWindowManager ) + InitFloatingWindows() ; + else + InitWindows(); } - TXNInitTextension(fontDescriptions, noOfFontDescriptions, options ); - } +#endif + if ( NavServicesAvailable() ) + NavLoad() ; + + long menuMgrAttr ; + Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ; + if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask ) + sUMAHasAquaLayout = true ; + + if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress ) + { + FontFamilyID fontId ; + Str255 fontName ; + SInt16 fontSize ; + Style fontStyle ; - sUMASystemInitialized = true ; + GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; + GetFNum( fontName, &fontId ); + TXNMacOSPreferredFontDescription fontDescriptions[] = + { + { fontId , (fontSize << 16) , kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } + } ; + int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ; + + OptionBits options = 0 ; + + if ( UMAGetSystemVersion() < 0x1000 ) + options |= kTXNAlwaysUseQuickDrawTextMask ; + + TXNInitTextension( fontDescriptions, noOfFontDescriptions, options ); + } + + UMASetSystemIsInitialized( true ); } -/* +#if 0 Boolean CanUseATSUI() - { - long result; - OSErr err = Gestalt(gestaltATSUVersion, &result); - return (err == noErr); - } -*/ +{ + long result; + OSErr err = Gestalt(gestaltATSUVersion, &result); + return (err == noErr); +} +#endif + // process manager -long UMAGetProcessMode() +long UMAGetProcessMode() { - OSErr err ; - ProcessInfoRec processinfo; - ProcessSerialNumber procno ; - - procno.highLongOfPSN = NULL ; - procno.lowLongOfPSN = kCurrentProcess ; - processinfo.processInfoLength = sizeof(ProcessInfoRec); - processinfo.processName = NULL; - processinfo.processAppSpec = NULL; + OSErr err ; + ProcessInfoRec processinfo; + ProcessSerialNumber procno ; + + procno.highLongOfPSN = 0 ; + procno.lowLongOfPSN = kCurrentProcess ; + processinfo.processInfoLength = sizeof(ProcessInfoRec); + processinfo.processName = NULL; + processinfo.processAppSpec = NULL; - err = ::GetProcessInformation( &procno , &processinfo ) ; - wxASSERT( err == noErr ) ; - return processinfo.processMode ; + err = ::GetProcessInformation( &procno , &processinfo ) ; + wxASSERT( err == noErr ) ; + + return processinfo.processMode ; } -bool UMAGetProcessModeDoesActivateOnFGSwitch() +bool UMAGetProcessModeDoesActivateOnFGSwitch() { - return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ; + return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ; } // menu manager -MenuRef UMANewMenu( SInt16 id , const wxString& title ) +MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding ) { - wxString str = wxStripMenuCodes( title ) ; - MenuRef menu ; + wxString str = wxStripMenuCodes( title ) ; + MenuRef menu ; + #if TARGET_CARBON - CFStringRef cfs = wxMacCreateCFString( str ) ; - CreateNewMenu( id , 0 , &menu ) ; - SetMenuTitleWithCFString( menu , cfs ) ; - CFRelease( cfs ) ; + CreateNewMenu( id , 0 , &menu ) ; + SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ; #else - Str255 ptitle ; - wxMacStringToPascal( str , ptitle ) ; - menu = ::NewMenu( id , ptitle ) ; + Str255 ptitle ; + wxMacStringToPascal( str , ptitle ) ; + menu = ::NewMenu( id , ptitle ) ; #endif - 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 - CFStringRef cfs = wxMacCreateCFString( str ) ; - SetMenuTitleWithCFString( menu , cfs ) ; - CFRelease( cfs ) ; + SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ; + #else - Str255 ptitle ; - wxMacStringToPascal( str , ptitle ) ; - SetMenuTitle( menu , ptitle ) ; + Str255 ptitle ; + wxMacStringToPascal( str , ptitle ) ; + SetMenuTitle( menu , ptitle ) ; #endif } -void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title ) +void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title, wxFontEncoding encoding ) { - wxString str = wxStripMenuCodes( title ) ; + // we don't strip the accels here anymore, must be done before + wxString str = title ; + #if TARGET_CARBON - CFStringRef cfs = wxMacCreateCFString( str ) ; - SetMenuItemTextWithCFString( menu , item , cfs ) ; - CFRelease( cfs ) ; + SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ; + #else - Str255 ptitle ; - wxMacStringToPascal( str , ptitle ) ; - SetMenuItemText( menu , item , ptitle ) ; + Str255 ptitle ; + wxMacStringToPascal( str , ptitle ) ; + SetMenuItemText( menu , item , ptitle ) ; #endif } - 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 ) ; - else - DisableMenuItem( inMenu , inItem ) ; + if ( enable ) + EnableMenuItem( inMenu , inItem ) ; + else + 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 ); - SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ; + MacAppendMenu( menu, "\pA" ); + UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding ); + 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 ) ; + MacInsertMenuItem( menu, "\pA" , item ); + UMASetMenuItemText( menu, item+1, title , encoding ); + SetMenuItemHierarchicalID( menu , item+1 , id ) ; } void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry ) { - if ( !entry ) - return ; - - UInt8 modifiers = 0 ; - SInt16 key = entry->GetKeyCode() ; - if ( key ) - { - bool explicitCommandKey = false ; - - if ( entry->GetFlags() & wxACCEL_CTRL ) - { - explicitCommandKey = true ; - } - - if (entry->GetFlags() & wxACCEL_ALT ) - { - modifiers |= kMenuOptionModifier ; - } - - if (entry->GetFlags() & wxACCEL_SHIFT) - { - modifiers |= kMenuShiftModifier ; - } - - SInt16 glyph = 0 ; - SInt16 macKey = key ; - if ( key >= WXK_F1 && key <= WXK_F15 ) - { - macKey = kFunctionKeyCharCode ; - glyph = kMenuF1Glyph + ( key - WXK_F1 ) ; - if ( key >= WXK_F13 ) - glyph += 13 ; + if ( !entry ) + return ; + + UInt8 modifiers = 0 ; + SInt16 key = entry->GetKeyCode() ; + if ( key ) + { + bool explicitCommandKey = (entry->GetFlags() & wxACCEL_CTRL); + + if (entry->GetFlags() & wxACCEL_ALT) + modifiers |= kMenuOptionModifier ; + + if (entry->GetFlags() & wxACCEL_SHIFT) + modifiers |= kMenuShiftModifier ; + + SInt16 glyph = 0 ; + SInt16 macKey = key ; + if ( key >= WXK_F1 && key <= WXK_F15 ) + { 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 - { - switch( key ) - { - case WXK_BACK : - macKey = kBackspaceCharCode ; - glyph = kMenuDeleteLeftGlyph ; - break ; - case WXK_TAB : - macKey = kTabCharCode ; - glyph = kMenuTabRightGlyph ; - break ; - case kEnterCharCode : - macKey = kEnterCharCode ; - glyph = kMenuEnterGlyph ; - break ; - case WXK_RETURN : - macKey = kReturnCharCode ; - glyph = kMenuReturnGlyph ; - break ; - case WXK_ESCAPE : - macKey = kEscapeCharCode ; - glyph = kMenuEscapeGlyph ; - break ; - case WXK_SPACE : - macKey = ' ' ; - glyph = kMenuSpaceGlyph ; - break ; - case WXK_DELETE : - macKey = kDeleteCharCode ; - glyph = kMenuDeleteRightGlyph ; - break ; - case WXK_CLEAR : - macKey = kClearCharCode ; - glyph = kMenuClearGlyph ; - break ; - case WXK_PRIOR : // PAGE UP - macKey = kPageUpCharCode ; - glyph = kMenuPageUpGlyph ; - break ; - case WXK_NEXT : - macKey = kPageDownCharCode ; - glyph = kMenuPageDownGlyph ; - break ; - case WXK_LEFT : - macKey = kLeftArrowCharCode ; - glyph = kMenuLeftArrowGlyph ; - break ; - case WXK_UP : - macKey = kUpArrowCharCode ; - glyph = kMenuUpArrowGlyph ; - break ; - case WXK_RIGHT : - macKey = kRightArrowCharCode ; - glyph = kMenuRightArrowGlyph ; - break ; - case WXK_DOWN : - macKey = kDownArrowCharCode ; - glyph = kMenuDownArrowGlyph ; - break ; + 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. + macKey = 0 ; + glyph = kMenuF1Glyph + ( key - WXK_F1 ) ; + if ( key >= WXK_F13 ) + glyph += 13 ; + } + else + { + switch ( key ) + { + case WXK_BACK : + macKey = kBackspaceCharCode ; + glyph = kMenuDeleteLeftGlyph ; + break ; + + case WXK_TAB : + macKey = kTabCharCode ; + glyph = kMenuTabRightGlyph ; + break ; + + case kEnterCharCode : + macKey = kEnterCharCode ; + glyph = kMenuEnterGlyph ; + break ; + + case WXK_RETURN : + macKey = kReturnCharCode ; + glyph = kMenuReturnGlyph ; + break ; + + case WXK_ESCAPE : + macKey = kEscapeCharCode ; + glyph = kMenuEscapeGlyph ; + break ; + + case WXK_SPACE : + macKey = ' ' ; + glyph = kMenuSpaceGlyph ; + break ; + + case WXK_DELETE : + macKey = kDeleteCharCode ; + glyph = kMenuDeleteRightGlyph ; + break ; + + case WXK_CLEAR : + macKey = kClearCharCode ; + glyph = kMenuClearGlyph ; + break ; + + case WXK_PRIOR : // PAGE UP + macKey = kPageUpCharCode ; + glyph = kMenuPageUpGlyph ; + break ; + + case WXK_NEXT : + macKey = kPageDownCharCode ; + glyph = kMenuPageDownGlyph ; + break ; + + case WXK_LEFT : + macKey = kLeftArrowCharCode ; + glyph = kMenuLeftArrowGlyph ; + break ; + + case WXK_UP : + macKey = kUpArrowCharCode ; + glyph = kMenuUpArrowGlyph ; + break ; + + case WXK_RIGHT : + macKey = kRightArrowCharCode ; + glyph = kMenuRightArrowGlyph ; + break ; + + case WXK_DOWN : + macKey = kDownArrowCharCode ; + glyph = kMenuDownArrowGlyph ; + break ; + + default : + macKey = toupper( key ) ; + break ; } + + // we now allow non command key shortcuts + // remove in case this gives problems + if ( !explicitCommandKey ) + modifiers |= kMenuNoCommandModifier ; } - SetItemCmd( menu, item , macKey ); - SetMenuItemModifiers(menu, item , modifiers ) ; + // 1d and 1e have special meaning to SetItemCmd, so + // do not use for these character codes. + if (key != WXK_UP && key != WXK_RIGHT) + SetItemCmd( menu, item , macKey ); + + SetMenuItemModifiers( menu, item , modifiers ) ; if ( glyph ) - SetMenuItemKeyGlyph(menu, item , glyph ) ; - } + SetMenuItemKeyGlyph( menu, item , glyph ) ; + } } -void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry ) +void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry ) { - MacAppendMenu(menu, "\pA"); - UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title ); - UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ; + MacAppendMenu(menu, "\pA"); + + // 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 ) ; } -void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry ) +void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry ) { - MacInsertMenuItem( menu , "\p" , item) ; - UMASetMenuItemText(menu, item , title ); - UMASetMenuItemShortcut( menu , item , entry ) ; + MacInsertMenuItem( menu , "\pA" , item) ; + + // 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 ) ; } // quickdraw +#if !TARGET_CARBON + int gPrOpenCounter = 0 ; -OSStatus UMAPrOpen(void *macPrintSession) +OSStatus UMAPrOpen() { -#if !TARGET_CARBON - OSErr err = noErr ; - ++gPrOpenCounter ; - if ( gPrOpenCounter == 1 ) - { - PrOpen() ; - err = PrError() ; - 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 + OSErr err = noErr ; + + ++gPrOpenCounter ; + + if ( gPrOpenCounter == 1 ) + { + PrOpen() ; + err = PrError() ; + wxASSERT( err == noErr ) ; + } + + return err ; } -OSStatus UMAPrClose(void *macPrintSession) +OSStatus UMAPrClose() { -#if !TARGET_CARBON - OSErr err = noErr ; - wxASSERT( gPrOpenCounter >= 1 ) ; - if ( gPrOpenCounter == 1 ) - { - PrClose() ; - err = PrError() ; - wxASSERT( err == noErr ) ; - } - --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 -} + OSErr err = noErr ; -#if !TARGET_CARBON + wxASSERT( gPrOpenCounter >= 1 ) ; -pascal QDGlobalsPtr GetQDGlobalsPtr (void) ; -pascal QDGlobalsPtr GetQDGlobalsPtr (void) + if ( gPrOpenCounter == 1 ) + { + PrClose() ; + err = PrError() ; + wxASSERT( err == noErr ) ; + } + + --gPrOpenCounter ; + + return err ; +} + +pascal QDGlobalsPtr GetQDGlobalsPtr() ; +pascal QDGlobalsPtr GetQDGlobalsPtr() { - return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA); + return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA); } #endif -void UMAShowWatchCursor() +void UMAShowWatchCursor() { - OSErr err = noErr; + OSErr err = noErr; - CursHandle watchFob = GetCursor (watchCursor); + 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 - } + if (watchFob == NULL) + { + err = nilHandleErr; + } + else + { +#if TARGET_CARBON +// Cursor preservedArrow; +// GetQDGlobalsArrow(&preservedArrow); +// SetQDGlobalsArrow(*watchFob); +// InitCursor(); +// SetQDGlobalsArrow(&preservedArrow); + SetCursor(*watchFob); +#else + SetCursor(*watchFob); +#endif + } } -void UMAShowArrowCursor() +void UMAShowArrowCursor() { #if TARGET_CARBON - Cursor arrow; - SetCursor (GetQDGlobalsArrow (&arrow)); + Cursor arrow; + SetCursor( GetQDGlobalsArrow(&arrow) ); #else - SetCursor (&(qd.arrow)); + SetCursor (&(qd.arrow)); #endif } // window manager -GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) +GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) { - wxASSERT( inWindowRef != NULL ) ; -#if TARGET_CARBON - return (GrafPtr) GetWindowPort( inWindowRef ) ; + wxASSERT( inWindowRef != NULL ) ; + +#if TARGET_CARBON + return (GrafPtr) GetWindowPort( inWindowRef ) ; #else - return (GrafPtr) inWindowRef ; + 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 , wxFontEncoding encoding ) { - Str255 ptitle ; - strncpy( (char*)ptitle , title , 96 ) ; - ptitle[96] = 0 ; #if TARGET_CARBON - c2pstrcpy( ptitle, (char *)ptitle ) ; + SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ; + #else - c2pstr( (char*)ptitle ) ; + Str255 ptitle ; + wxMacStringToPascal( title , ptitle ) ; + SetWTitle( inWindowRef , ptitle ) ; #endif - SetWTitle( inWindowRef , ptitle ) ; } -void UMAGetWTitleC( WindowRef inWindowRef , char *title ) +// appearance additions + +void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding ) { - GetWTitle( inWindowRef , (unsigned char*)title ) ; #if TARGET_CARBON - p2cstrcpy( title, (unsigned char *)title ) ; + SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ; + #else - p2cstr( (unsigned char*)title ) ; + Str255 ptitle ; + wxMacStringToPascal( title , ptitle ) ; + SetControlTitle( inControl , ptitle ) ; #endif } -// appearance additions - -void UMAActivateControl( ControlHandle inControl ) +void UMAActivateControl( ControlRef inControl ) { +#if TARGET_API_MAC_OSX + ::ActivateControl( inControl ) ; + +#else // we have to add the control after again to the update rgn // otherwise updates get lost - if ( !IsControlActive( inControl ) ) - { + if ( !IsControlActive( inControl ) ) + { bool visible = IsControlVisible( inControl ) ; if ( visible ) - SetControlVisibility( inControl , false , false ) ; + SetControlVisibility( inControl , false , false ) ; + ::ActivateControl( inControl ) ; - if ( visible ) { - SetControlVisibility( inControl , true , false ) ; - Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + + if ( visible ) + { + SetControlVisibility( inControl , true , false ) ; + + Rect ctrlBounds ; + InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; } - } + } +#endif } -void UMADrawControl( ControlHandle inControl ) +void UMAMoveControl( ControlRef inControl , short x , short y ) { - 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 ) ; -} +#if TARGET_API_MAC_OSX + ::MoveControl( inControl , x , y ) ; -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) ) ; - } +#else + 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) ) ; + } +#endif } -void UMASizeControl( ControlHandle inControl , short x , short y ) +void UMASizeControl( ControlRef 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) ) ; - } +#if TARGET_API_MAC_OSX + ::SizeControl( inControl , x , y ) ; + +#else + 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) ) ; + } +#endif } -void UMADeactivateControl( ControlHandle inControl ) +void UMADeactivateControl( ControlRef inControl ) { +#if TARGET_API_MAC_OSX + ::DeactivateControl( inControl ) ; + +#else // 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) ) ; - } -} -// shows the control and adds the region to the update region -void UMAShowControl (ControlHandle inControl) -{ + 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) ) ; + InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; + } +#endif } // shows the control and adds the region to the update region -void UMAHideControl (ControlHandle inControl) +void UMAShowControl( ControlRef inControl ) { - SetControlVisibility( inControl , false , false ) ; - Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + SetControlVisibility( inControl , true , false ) ; + Rect ctrlBounds ; + InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(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 ; +// hides the control and adds the region to the update region +void UMAHideControl( ControlRef inControl ) +{ + SetControlVisibility( inControl , false , false ) ; + Rect ctrlBounds ; + InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; } - - - -// events -void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) +// keyboard focus +OSErr UMASetKeyboardFocus( WindowPtr inWindow, + ControlRef inControl, + ControlFocusPart inPart ) { - RgnHandle updateRgn = NewRgn() ; - GetWindowUpdateRgn( inWindow , updateRgn ) ; + OSErr err = noErr; + GrafPtr port ; - Point zero = { 0 , 0 } ; - LocalToGlobal( &zero ) ; - OffsetRgn( updateRgn , -zero.h , -zero.v ) ; + GetPort( &port ) ; + SetPortWindowPort( inWindow ) ; - UpdateControls( inWindow , inRgn ) ; - InvalWindowRgn( inWindow, updateRgn) ; - DisposeRgn( updateRgn ) ; + err = SetKeyboardFocus( inWindow , inControl , inPart ) ; + SetPort( port ) ; + return err ; } -bool UMAIsWindowFloating( WindowRef inWindow ) +bool UMAIsWindowFloating( WindowRef inWindow ) { - WindowClass cl ; - - GetWindowClass( inWindow , &cl ) ; - return cl == kFloatingWindowClass ; + WindowClass cl ; + + GetWindowClass( inWindow , &cl ) ; + return cl == kFloatingWindowClass ; } -bool UMAIsWindowModal( WindowRef inWindow ) +bool UMAIsWindowModal( WindowRef inWindow ) { - WindowClass cl ; - - GetWindowClass( inWindow , &cl ) ; - return cl < kFloatingWindowClass ; + WindowClass cl ; + + GetWindowClass( inWindow , &cl ) ; + return cl < kFloatingWindowClass ; } // others void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) { - if ( inWindowRef ) - { -// 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 ) ; - } -} -OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) -{ - return ::DrawThemePlacard( inRect , inState ) ; + if ( inWindowRef ) + { +// bool isHighlighted = IsWindowHighlited( inWindowRef ) ; +// if ( inActivate != isHighlighted ) + + GrafPtr port ; + GetPort( &port ) ; + SetPortWindowPort( inWindowRef ) ; + HiliteWindow( inWindowRef , inActivate ) ; + ControlRef control = NULL ; + ::GetRootControl( inWindowRef , &control ) ; + if ( control ) + { + if ( inActivate ) + UMAActivateControl( control ) ; + else + UMADeactivateControl( control ) ; + } + + SetPort( port ) ; + } +} + +OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) +{ + return ::DrawThemePlacard( inRect , inState ) ; } #if !TARGET_CARBON @@ -761,91 +747,133 @@ static MenuItemIndex firstCustomItemIndex = 0 ; #endif OSStatus UMAGetHelpMenu( - MenuRef * outHelpMenu, - MenuItemIndex * outFirstCustomItemIndex) + MenuRef * outHelpMenu, + MenuItemIndex * outFirstCustomItemIndex) { #if TARGET_CARBON - return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ; + 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 ; + 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) +wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport ) { - m_clip = NULL ; - Setup( newport ) ; + m_clip = NULL ; + Setup( newport ) ; } wxMacPortStateHelper::wxMacPortStateHelper() { - m_clip = NULL ; + m_clip = NULL ; } void wxMacPortStateHelper::Setup( GrafPtr newport ) { - GetPort( &m_oldPort ) ; - SetPort( newport ) ; - wxASSERT_MSG( m_clip == NULL , "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 ; + GetPort( &m_oldPort ) ; + SetPort( newport ) ; + SetOrigin(0, 0); + + 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 ; - } + if ( m_clip ) + { + DisposeRgn( m_clip ) ; + DisposeThemeDrawingState( m_drawingState ) ; + m_clip = NULL ; + } } 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 ) ; - } + 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 ; + OSStatus err = noErr ; + #if !TARGET_CARBON err = PutScrap( size , type , data ) ; #else ScrapRef scrap; - err = GetCurrentScrap (&scrap); - if ( !err ) + err = GetCurrentScrap( &scrap ); + if ( err == noErr ) + err = PutScrapFlavor( scrap, type , 0, size, data ); +#endif + + return err ; +} + +Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds ) +{ + GetControlBounds( theControl , bounds ) ; + +#if TARGET_API_MAC_OSX + WindowRef tlwref = GetControlOwner( theControl ) ; + + wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ; + if ( tlwwx != NULL && tlwwx->MacUsesCompositing() ) { - err = PutScrapFlavor (scrap, type , 0, size, data); + ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ; + HIPoint hiPoint = CGPointMake( 0 , 0 ) ; + HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl ) ; + OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ; } #endif - return err ; + + return bounds ; } +#endif // wxUSE_GUI + +#if wxUSE_BASE + +static bool sUMASystemInitialized = false ; + +bool UMASystemIsInitialized() +{ + return sUMASystemInitialized ; +} + +void UMASetSystemIsInitialized(bool val) +{ + sUMASystemInitialized = val; +} + +#endif // wxUSE_BASE +