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 9e84f4d9e95723fff5b77d5bd13afe46eac60c96..f6bd01f91f09360764787645054b9a3b3b78ec73 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -104,6 +104,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                NavLoad() ;
        }
 
                NavLoad() ;
        }
 

+  long menuMgrAttr ;
+  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
+  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
+    sUMAHasAquaLayout = true ;
+

   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
   { 
     FontFamilyID fontId ;
   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
   { 
     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 ;
 
 }

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 9e84f4d9e95723fff5b77d5bd13afe46eac60c96..f6bd01f91f09360764787645054b9a3b3b78ec73 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -104,6 +104,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                NavLoad() ;
        }
 
                NavLoad() ;
        }
 

+  long menuMgrAttr ;
+  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
+  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
+    sUMAHasAquaLayout = true ;
+

   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
   { 
     FontFamilyID fontId ;
   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
   { 
     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 ;
 
 }