X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54ddeb7e1bb71cd067c667e129726bcdc16948f0..29e4a1901a9d0cd738af42f4207ae185eaf3b96e:/src/mac/carbon/uma.cpp diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 9e84f4d9e9..f6bd01f91f 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -104,6 +104,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) NavLoad() ; } + long menuMgrAttr ; + Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ; + if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask ) + sUMAHasAquaLayout = true ; + if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress ) { FontFamilyID fontId ; @@ -132,10 +137,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) TXNInitTextension(fontDescriptions, noOfFontDescriptions, options ); } - long menuMgrAttr ; - Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ; - if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask ) - sUMAHasAquaLayout = true ; + sUMASystemInitialized = true ; }