X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6c3d3e655c4637764f60eb28a3d7e7ed3d9732b..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/mac/carbon/uma.cpp diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 161708406b..b1d5ade518 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -11,52 +11,30 @@ #include "wx/wxprec.h" +#include "wx/mac/uma.h" + #if wxUSE_GUI #include "wx/toplevel.h" #include "wx/dc.h" -#ifndef __DARWIN__ -# include -# include -# if defined(TARGET_CARBON) -# if PM_USE_SESSION_APIS -# include -# endif -# include -# else -# include -# endif -#endif - -#ifndef __DARWIN__ -# include -#endif - #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 wxWidgets code can safely assume that appearance 1.1 -// windows manager, control manager, navigation services etc. are -// present - static SInt32 sUMASystemVersion = 0 ; -long UMAGetSystemVersion() { return sUMASystemVersion ; } - -void UMACleanupToolbox() -{ +long UMAGetSystemVersion() +{ + if ( sUMASystemVersion == 0 ) + { + verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion)); + } + return sUMASystemVersion ; } -void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) +void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls), + bool WXUNUSED(isEmbedded) ) { - ::InitCursor(); - - if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr) - sUMASystemVersion = 0x0000 ; - -#ifndef __LP64__ +#if 0 // ndef __LP64__ { FontFamilyID fontId ; Str255 fontName ; @@ -74,57 +52,22 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded ) OptionBits options = 0 ; - if ( UMAGetSystemVersion() < 0x1000 ) - options |= kTXNAlwaysUseQuickDrawTextMask ; - TXNInitTextension( fontDescriptions, noOfFontDescriptions, options ); } #endif - - UMASetSystemIsInitialized( true ); -} - -// process manager -long UMAGetProcessMode() -{ - OSErr err ; - ProcessInfoRec processinfo; - ProcessSerialNumber procno ; - - procno.highLongOfPSN = 0 ; - procno.lowLongOfPSN = kCurrentProcess ; - processinfo.processInfoLength = sizeof(ProcessInfoRec); - processinfo.processName = NULL; -#ifndef __LP64__ - processinfo.processAppSpec = NULL; -#endif - - err = ::GetProcessInformation( &procno , &processinfo ) ; - wxASSERT( err == noErr ) ; - - return processinfo.processMode ; -} - -bool UMAGetProcessModeDoesActivateOnFGSwitch() -{ - return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ; } // menu manager +#if wxMAC_USE_COCOA == 0 + 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 , encoding ) ) ; -#else - Str255 ptitle ; - wxMacStringToPascal( str , ptitle ) ; - menu = ::NewMenu( id , ptitle ) ; -#endif + SetMenuTitleWithCFString( menu , wxCFStringRef(str , encoding ) ) ; return menu ; } @@ -133,14 +76,7 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding enco { wxString str = wxStripMenuCodes( title ) ; -#if TARGET_CARBON - SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ; - -#else - Str255 ptitle ; - wxMacStringToPascal( str , ptitle ) ; - SetMenuTitle( menu , ptitle ) ; -#endif + SetMenuTitleWithCFString( menu , wxCFStringRef(str , encoding) ) ; } void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title, wxFontEncoding encoding ) @@ -148,19 +84,7 @@ void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& titl // we don't strip the accels here anymore, must be done before wxString str = title ; -#if TARGET_CARBON - SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ; - -#else - Str255 ptitle ; - wxMacStringToPascal( str , ptitle ) ; - SetMenuItemText( menu , item , ptitle ) ; -#endif -} - -UInt32 UMAMenuEvent( EventRecord *inEvent ) -{ - return MenuEvent( inEvent ) ; + SetMenuItemTextWithCFString( menu , item , wxCFStringRef(str , encoding) ) ; } void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) @@ -174,7 +98,7 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable) void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id ) { AppendMenuItemTextWithCFString( menu, - CFSTR("A"), 0, 0,NULL); + CFSTR("A"), 0, 0,NULL); UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding ); SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ; } @@ -182,8 +106,8 @@ void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id ) { InsertMenuItemTextWithCFString( menu, - CFSTR("A"), item, 0, 0); - + CFSTR("A"), item, 0, 0); + UMASetMenuItemText( menu, item+1, title , encoding ); SetMenuItemHierarchicalID( menu , item+1 , id ) ; } @@ -218,7 +142,7 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn macKey = 0 ; glyph = kMenuF1Glyph + ( key - WXK_F1 ) ; if ( key >= WXK_F13 ) - glyph += 13 ; + glyph += 12 ; } else { @@ -329,7 +253,7 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry ) { AppendMenuItemTextWithCFString( menu, - CFSTR("A"), 0, 0,NULL); + 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 ); @@ -339,7 +263,7 @@ void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry ) { InsertMenuItemTextWithCFString( menu, - CFSTR("A"), item, 0, 0); + CFSTR("A"), item, 0, 0); // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ; @@ -347,435 +271,46 @@ void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc 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() ; -pascal QDGlobalsPtr GetQDGlobalsPtr() -{ - return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA); -} - -#endif - -void UMAShowWatchCursor() -{ - SetThemeCursor(kThemeWatchCursor); -} - -void UMAShowArrowCursor() -{ - SetThemeCursor(kThemeArrowCursor); -} - -// 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 , wxFontEncoding encoding ) -{ -#if TARGET_CARBON - SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ; - -#else - Str255 ptitle ; - wxMacStringToPascal( title , ptitle ) ; - SetWTitle( inWindowRef , ptitle ) ; -#endif -} - -// appearance additions - -void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding ) -{ -#if TARGET_CARBON - SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ; - -#else - Str255 ptitle ; - wxMacStringToPascal( title , ptitle ) ; - SetControlTitle( inControl , ptitle ) ; -#endif -} - -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 ) ) - { - bool visible = IsControlVisible( inControl ) ; - if ( visible ) - SetControlVisibility( inControl , false , false ) ; - - ::ActivateControl( inControl ) ; - - if ( visible ) - { - SetControlVisibility( inControl , true , false ) ; - - Rect ctrlBounds ; - InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; - } - } -#endif -} - -void UMAMoveControl( ControlRef inControl , short x , short y ) -{ -#if TARGET_API_MAC_OSX - ::MoveControl( inControl , x , y ) ; - -#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( ControlRef inControl , short x , short y ) -{ -#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( ControlRef inControl ) -{ -#if TARGET_API_MAC_OSX - ::DeactivateControl( inControl ) ; +#if wxMAC_USE_COCOA == 0 -#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), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ; - } -#endif -} - -// shows the control and adds the region to the update region -void UMAShowControl( ControlRef inControl ) -{ - SetControlVisibility( inControl , true , false ) ; - HIViewSetNeedsDisplay( inControl, true ); -} +static OSStatus UMAGetHelpMenu( + MenuRef * outHelpMenu, + MenuItemIndex * outFirstCustomItemIndex, + bool allowHelpMenuCreation); -// hides the control and adds the region to the update region -void UMAHideControl( ControlRef inControl ) +static OSStatus UMAGetHelpMenu( + MenuRef * outHelpMenu, + MenuItemIndex * outFirstCustomItemIndex, + bool allowHelpMenuCreation) { - SetControlVisibility( inControl , false , false ) ; - HIViewSetNeedsDisplay( inControl, true ); -} - -// keyboard focus -OSErr UMASetKeyboardFocus( WindowPtr inWindow, - ControlRef inControl, - ControlFocusPart inPart ) -{ - OSErr err = noErr; -#ifndef __LP64__ - GrafPtr port ; - - GetPort( &port ) ; - SetPortWindowPort( inWindow ) ; -#endif - - err = SetKeyboardFocus( inWindow , inControl , inPart ) ; -#ifndef __LP64__ - SetPort( port ) ; -#endif - - return err ; -} - -bool UMAIsWindowFloating( WindowRef inWindow ) -{ - WindowClass cl ; - - GetWindowClass( inWindow , &cl ) ; - return cl == kFloatingWindowClass ; -} - -bool UMAIsWindowModal( WindowRef inWindow ) -{ - WindowClass cl ; - - GetWindowClass( inWindow , &cl ) ; - return cl < kFloatingWindowClass ; -} - -// others - -void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) -{ - if ( inWindowRef ) + static bool s_createdHelpMenu = false ; + + if ( !s_createdHelpMenu && !allowHelpMenuCreation ) { -// bool isHighlighted = IsWindowHighlited( inWindowRef ) ; -// if ( inActivate != isHighlighted ) -#ifndef __LP64__ - GrafPtr port ; - GetPort( &port ) ; - SetPortWindowPort( inWindowRef ) ; -#endif - HiliteWindow( inWindowRef , inActivate ) ; - ControlRef control = NULL ; - ::GetRootControl( inWindowRef , &control ) ; - if ( control ) - { - if ( inActivate ) - UMAActivateControl( control ) ; - else - UMADeactivateControl( control ) ; - } -#ifndef __LP64__ - SetPort( port ) ; -#endif + return paramErr ; } + + OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ; + s_createdHelpMenu = ( status == noErr ) ; + return status ; } -OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) -{ -#ifndef __LP64__ - return ::DrawThemePlacard( inRect , inState ) ; -#else - return noErr; -#endif -} - -#if !TARGET_CARBON -static OSStatus helpMenuStatus = noErr ; -static MenuItemIndex firstCustomItemIndex = 0 ; -#endif - 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 -} - -#ifndef __LP64__ - -wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport ) + MenuRef * outHelpMenu, + MenuItemIndex * outFirstCustomItemIndex) { - m_clip = NULL ; - Setup( newport ) ; + return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , true ); } -wxMacPortStateHelper::wxMacPortStateHelper() +OSStatus UMAGetHelpMenuDontCreate( + MenuRef * outHelpMenu, + MenuItemIndex * outFirstCustomItemIndex) { - m_clip = NULL ; -} - -void wxMacPortStateHelper::Setup( GrafPtr 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 ; - } -} - -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 ) ; - } + return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , false ); } #endif -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 == 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 ) - { - 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 bounds ; -} - #endif // wxUSE_GUI - -#if wxUSE_BASE - -static bool sUMASystemInitialized = false ; - -bool UMASystemIsInitialized() -{ - return sUMASystemInitialized ; -} - -void UMASetSystemIsInitialized(bool val) -{ - sUMASystemInitialized = val; -} - -#endif // wxUSE_BASE