X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca5e5bad86564bf71c095b755291f6997844b10a..58ec225526177917a3806c6cd394ab56d18280e1:/src/mac/uma.cpp diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp index dbdb59341f..c9342a3947 100644 --- a/src/mac/uma.cpp +++ b/src/mac/uma.cpp @@ -94,7 +94,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ; } -#ifndef __DARWIN__ #if TARGET_CARBON // Call currently implicitely done : InitFloatingWindows() ; #else @@ -102,7 +101,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) InitFloatingWindows() ; else InitWindows(); -#endif #endif if ( NavServicesAvailable() ) @@ -588,8 +586,10 @@ 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( MenuRef * outHelpMenu,