added mlte initialization

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index c9342a3947819817e6d340e8800f32428478b0ee..a8f29cbbfdfe086e078213668870a7ee69599c12 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -21,9 +21,6 @@
 // windows manager, control manager, navigation services etc. are 
 // present
 
 // windows manager, control manager, navigation services etc. are 
 // present
 

-#define wxUSE_MLTE 0
-
-

 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;


@@ -51,9 +48,8 @@ void UMACleanupToolbox()
        {
                NavUnload() ;
        }
        {
                NavUnload() ;
        }

-#if wxUSE_MLTE
-       TXNTerminateTextension( ) ;
-#endif
+  if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
+         TXNTerminateTextension( ) ;

 }
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {
 }
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {


@@ -108,14 +104,16 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                NavLoad() ;
        }
 
                NavLoad() ;
        }
 

-#if wxUSE_MLTE
-  TXNMacOSPreferredFontDescription defaults;
-  defaults.fontID = kFontIDGeneva ;
-  defaults.pointSize = (10 << 16) ;
-  defaults.fontStyle = kTXNDefaultFontStyle;
-  defaults.encoding = kTXNSystemDefaultEncoding;
-       TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
-#endif
+  if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
+  { 
+    TXNMacOSPreferredFontDescription defaults;
+    defaults.fontID = kFontIDGeneva ;
+    defaults.pointSize = (10 << 16) ;
+    defaults.fontStyle = kTXNDefaultFontStyle;
+    defaults.encoding = kTXNSystemDefaultEncoding;
+       TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
+       }
+

   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index c9342a3947819817e6d340e8800f32428478b0ee..a8f29cbbfdfe086e078213668870a7ee69599c12 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -21,9 +21,6 @@
 // windows manager, control manager, navigation services etc. are 
 // present
 
 // windows manager, control manager, navigation services etc. are 
 // present
 

-#define wxUSE_MLTE 0
-
-

 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;


@@ -51,9 +48,8 @@ void UMACleanupToolbox()
        {
                NavUnload() ;
        }
        {
                NavUnload() ;
        }

-#if wxUSE_MLTE
-       TXNTerminateTextension( ) ;
-#endif
+  if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
+         TXNTerminateTextension( ) ;

 }
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {
 }
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {


@@ -108,14 +104,16 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                NavLoad() ;
        }
 
                NavLoad() ;
        }
 

-#if wxUSE_MLTE
-  TXNMacOSPreferredFontDescription defaults;
-  defaults.fontID = kFontIDGeneva ;
-  defaults.pointSize = (10 << 16) ;
-  defaults.fontStyle = kTXNDefaultFontStyle;
-  defaults.encoding = kTXNSystemDefaultEncoding;
-       TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
-#endif
+  if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
+  { 
+    TXNMacOSPreferredFontDescription defaults;
+    defaults.fontID = kFontIDGeneva ;
+    defaults.pointSize = (10 << 16) ;
+    defaults.fontStyle = kTXNDefaultFontStyle;
+    defaults.encoding = kTXNSystemDefaultEncoding;
+       TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
+       }
+

   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )