X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f17e0be47983c76b2192890637edc2514802612d..3a46bcdd32a216b78174c1d115ced691d02932a7:/src/mac/carbon/uma.cpp diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 6a9fa8e53e..2f6077ee1a 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -9,14 +9,14 @@ // Licence: The wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/defs.h" +#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 @@ -33,14 +33,17 @@ #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 +// 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 ; @@ -48,11 +51,12 @@ static bool sUMAHasAquaLayout = 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 ; } @@ -63,16 +67,15 @@ bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; } void UMACleanupToolbox() { if (sUMAHasInittedAppearance) - { UnregisterAppearanceClient() ; - } + if ( NavServicesAvailable() ) - { NavUnload() ; - } + if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress ) TXNTerminateTextension( ) ; } + void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) { #if !TARGET_CARBON @@ -102,12 +105,13 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) long theAppearance ; if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr ) { - sUMAHasAppearance = true ; - OSStatus status = RegisterAppearanceClient(); // 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. @@ -115,18 +119,13 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) } 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() ; @@ -141,56 +140,49 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) #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 ; - 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 + long menuMgrAttr ; + Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ; + if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask ) + sUMAHasAquaLayout = true ; + + if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress ) { - options |= kTXNAlwaysUseQuickDrawTextMask ; - } - TXNInitTextension(fontDescriptions, noOfFontDescriptions, options ); - } + FontFamilyID fontId ; + Str255 fontName ; + SInt16 fontSize ; + Style fontStyle ; + GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; + GetFNum( fontName, &fontId ); - UMASetSystemIsInitialized(true); + 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); - } -*/ +} +#endif + // process manager long UMAGetProcessMode() { @@ -198,7 +190,7 @@ long UMAGetProcessMode() ProcessInfoRec processinfo; ProcessSerialNumber procno ; - procno.highLongOfPSN = NULL ; + procno.highLongOfPSN = 0 ; procno.lowLongOfPSN = kCurrentProcess ; processinfo.processInfoLength = sizeof(ProcessInfoRec); processinfo.processName = NULL; @@ -206,6 +198,7 @@ long UMAGetProcessMode() err = ::GetProcessInformation( &procno , &processinfo ) ; wxASSERT( err == noErr ) ; + return processinfo.processMode ; } @@ -216,26 +209,30 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch() // menu manager -MenuRef UMANewMenu( SInt16 id , const wxString& title ) +MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding ) { wxString str = wxStripMenuCodes( title ) ; MenuRef menu ; + #if TARGET_CARBON CreateNewMenu( id , 0 , &menu ) ; - SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ; + SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ; #else Str255 ptitle ; wxMacStringToPascal( str , ptitle ) ; menu = ::NewMenu( id , ptitle ) ; #endif + return menu ; } -void UMASetMenuTitle( MenuRef menu , const wxString& title ) +void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding ) { wxString str = wxStripMenuCodes( title ) ; + #if TARGET_CARBON - SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ; + SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ; + #else Str255 ptitle ; wxMacStringToPascal( str , ptitle ) ; @@ -243,11 +240,14 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title ) #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 - SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str) ) ; + SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ; + #else Str255 ptitle ; wxMacStringToPascal( str , ptitle ) ; @@ -255,10 +255,9 @@ void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& tit #endif } - UInt32 UMAMenuEvent( EventRecord *inEvent ) { - return MenuEvent( inEvent ) ; + return MenuEvent( inEvent ) ; } void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) @@ -269,18 +268,18 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) 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 ); + 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 ) @@ -292,27 +291,21 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn SInt16 key = entry->GetKeyCode() ; if ( key ) { - bool explicitCommandKey = false ; - - if ( entry->GetFlags() & wxACCEL_CTRL ) - { - explicitCommandKey = true ; - } + bool explicitCommandKey = (entry->GetFlags() & wxACCEL_CTRL); - if (entry->GetFlags() & wxACCEL_ALT ) - { + 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 ; + // 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. @@ -320,91 +313,121 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn glyph = kMenuF1Glyph + ( key - WXK_F1 ) ; if ( key >= WXK_F13 ) glyph += 13 ; - if ( !explicitCommandKey ) - modifiers |= kMenuNoCommandModifier ; - } + } else { - switch( key ) + 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 && key != WXK_DOWN && key != WXK_LEFT) + 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 ) ; + + // 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 , "\pA" , item) ; - UMASetMenuItemText(menu, item+1 , title ); + + // 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 ) ; } @@ -417,32 +440,39 @@ 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) +pascal QDGlobalsPtr GetQDGlobalsPtr() ; +pascal QDGlobalsPtr GetQDGlobalsPtr() { return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA); } @@ -453,30 +483,32 @@ void UMAShowWatchCursor() { OSErr err = noErr; - CursHandle watchFob = GetCursor (watchCursor); + CursHandle watchFob = GetCursor(watchCursor); - if (!watchFob) + if (watchFob == NULL) + { err = nilHandleErr; + } else { - #if TARGET_CARBON +#if TARGET_CARBON // Cursor preservedArrow; -// GetQDGlobalsArrow (&preservedArrow); -// SetQDGlobalsArrow (*watchFob); -// InitCursor ( ); -// SetQDGlobalsArrow (&preservedArrow); - SetCursor (*watchFob); - #else - SetCursor (*watchFob); - #endif +// 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)); + SetCursor( GetQDGlobalsArrow(&arrow) ); #else SetCursor (&(qd.arrow)); #endif @@ -484,9 +516,10 @@ void UMAShowArrowCursor() // window manager -GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) +GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) { wxASSERT( inWindowRef != NULL ) ; + #if TARGET_CARBON return (GrafPtr) GetWindowPort( inWindowRef ) ; #else @@ -494,16 +527,18 @@ GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) #endif } -void UMADisposeWindow( WindowRef inWindowRef ) +void UMADisposeWindow( WindowRef inWindowRef ) { wxASSERT( inWindowRef != NULL ) ; + DisposeWindow( inWindowRef ) ; } -void UMASetWTitle( WindowRef inWindowRef , const wxString& title ) +void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding ) { #if TARGET_CARBON - SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title) ) ; + SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ; + #else Str255 ptitle ; wxMacStringToPascal( title , ptitle ) ; @@ -511,22 +546,13 @@ void UMASetWTitle( WindowRef inWindowRef , const wxString& title ) #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 -void UMASetControlTitle( ControlHandle inControl , const wxString& title ) +void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding ) { #if TARGET_CARBON - SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ; + SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ; + #else Str255 ptitle ; wxMacStringToPascal( title , ptitle ) ; @@ -534,8 +560,12 @@ void UMASetControlTitle( ControlHandle inControl , const wxString& title ) #endif } -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 ) ) @@ -543,121 +573,124 @@ void UMAActivateControl( ControlHandle inControl ) bool visible = IsControlVisible( inControl ) ; if ( visible ) SetControlVisibility( inControl , false , false ) ; + ::ActivateControl( inControl ) ; - if ( visible ) { + + if ( visible ) + { SetControlVisibility( inControl , true , false ) ; + Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; } } +#endif } -void UMADrawControl( ControlHandle inControl ) +void UMAMoveControl( ControlRef inControl , short x , short y ) { - WindowRef theWindow = GetControlOwner(inControl) ; - wxMacPortStateHelper help( (GrafPtr) GetWindowPort(theWindow) ) ; - 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 ) -{ +#else bool visible = IsControlVisible( inControl ) ; - if ( visible ) { + if ( visible ) + { SetControlVisibility( inControl , false , false ) ; Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ; } + ::MoveControl( inControl , x , y ) ; - if ( visible ) { + + if ( visible ) + { SetControlVisibility( inControl , true , false ) ; Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ; } +#endif } -void UMASizeControl( ControlHandle inControl , short x , short y ) +void UMASizeControl( ControlRef inControl , short x , short y ) { +#if TARGET_API_MAC_OSX + ::SizeControl( inControl , x , y ) ; + +#else bool visible = IsControlVisible( inControl ) ; - if ( visible ) { + if ( visible ) + { SetControlVisibility( inControl , false , false ) ; Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ; } + ::SizeControl( inControl , x , y ) ; - if ( visible ) { + + if ( visible ) + { SetControlVisibility( inControl , true , false ) ; Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&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 ) { + + 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 UMAShowControl (ControlHandle inControl) +void UMAShowControl( ControlRef inControl ) { SetControlVisibility( inControl , true , false ) ; Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; } -// shows the control and adds the region to the update region -void UMAHideControl (ControlHandle inControl) +// hides the control and adds the region to the update region +void UMAHideControl( ControlRef inControl ) { SetControlVisibility( inControl , false , false ) ; Rect ctrlBounds ; - InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ; + InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; } + // keyboard focus -OSErr UMASetKeyboardFocus (WindowPtr inWindow, - ControlHandle inControl, - ControlFocusPart inPart) +OSErr UMASetKeyboardFocus( WindowPtr inWindow, + ControlRef inControl, + ControlFocusPart inPart ) { OSErr err = noErr; GrafPtr port ; - GetPort( &port ) ; + GetPort( &port ) ; SetPortWindowPort( inWindow ) ; err = SetKeyboardFocus( inWindow , inControl , inPart ) ; SetPort( port ) ; - return err ; -} - - -// events -void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) -{ - wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) inWindow) ) ; - 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 ) ; + return err ; } bool UMAIsWindowFloating( WindowRef inWindow ) @@ -683,13 +716,14 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) if ( inWindowRef ) { // bool isHighlighted = IsWindowHighlited( inWindowRef ) ; -// if ( inActivate != isHightlited ) +// if ( inActivate != isHighlighted ) + GrafPtr port ; GetPort( &port ) ; SetPortWindowPort( inWindowRef ) ; HiliteWindow( inWindowRef , inActivate ) ; - ControlHandle control = NULL ; - ::GetRootControl( inWindowRef , & control ) ; + ControlRef control = NULL ; + ::GetRootControl( inWindowRef , &control ) ; if ( control ) { if ( inActivate ) @@ -697,6 +731,7 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) else UMADeactivateControl( control ) ; } + SetPort( port ) ; } } @@ -712,28 +747,29 @@ static MenuItemIndex firstCustomItemIndex = 0 ; #endif OSStatus UMAGetHelpMenu( - MenuRef * outHelpMenu, - MenuItemIndex * outFirstCustomItemIndex) + 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) +wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport ) { m_clip = NULL ; Setup( newport ) ; @@ -748,17 +784,19 @@ void wxMacPortStateHelper::Setup( GrafPtr newport ) { GetPort( &m_oldPort ) ; SetPort( newport ) ; - SetOrigin(0,0); + 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); + 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 ) @@ -788,17 +826,37 @@ wxMacPortStateHelper::~wxMacPortStateHelper() 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 = 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 @@ -817,5 +875,5 @@ void UMASetSystemIsInitialized(bool val) sUMASystemInitialized = val; } - #endif // wxUSE_BASE +