From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 20 May 2002 14:06:09 +0000 (+0000)
Subject: corrected initialization order of MLTE
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ded4fa5b7a2a8177a6905b9b0fcda1d3dac2d0ff

corrected initialization order of MLTE


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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 ;
 
 }
diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 9e84f4d9e9..f6bd01f91f 100644
--- a/src/mac/uma.cpp
+++ b/src/mac/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 ;
 
 }