Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected initialization order of MLTE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-05-20 14:06:09 +00:00
parent fe77cf604a
commit ded4fa5b7a
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mac/carbon/uma.cpp
View File

@@ -104,6 +104,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
NavLoad() ; NavLoad() ;
} }
long menuMgrAttr ;
Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
sUMAHasAquaLayout = true ;
if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress ) if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
{ {
FontFamilyID fontId ; FontFamilyID fontId ;
@@ -132,10 +137,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
TXNInitTextension(fontDescriptions, noOfFontDescriptions, options ); TXNInitTextension(fontDescriptions, noOfFontDescriptions, options );
} }
long menuMgrAttr ;
Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
sUMAHasAquaLayout = true ;
sUMASystemInitialized = true ; sUMASystemInitialized = true ;
} }

10
src/mac/uma.cpp
View File

@@ -104,6 +104,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
NavLoad() ; NavLoad() ;
} }
long menuMgrAttr ;
Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
sUMAHasAquaLayout = true ;
if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress ) if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
{ {
FontFamilyID fontId ; FontFamilyID fontId ;
@@ -132,10 +137,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
TXNInitTextension(fontDescriptions, noOfFontDescriptions, options ); TXNInitTextension(fontDescriptions, noOfFontDescriptions, options );
} }
long menuMgrAttr ;
Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
sUMAHasAquaLayout = true ;
sUMASystemInitialized = true ; sUMASystemInitialized = true ;
} }