native window disposal is moved to deferred delete, size of parent taken into account...

[wxWidgets.git] / src / mac / uma.cpp

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index dbdb59341f67579a89479f8499342cb48602a16e..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
 
-#define wxUSE_MLTE 0
-
-
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;
@@ -51,9 +48,8 @@ void UMACleanupToolbox()
        {
                NavUnload() ;
        }
-#if wxUSE_MLTE
-       TXNTerminateTextension( ) ;
-#endif
+  if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
+         TXNTerminateTextension( ) ;
 }
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {
@@ -94,7 +90,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
                
-#ifndef __DARWIN__
 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else
@@ -102,7 +97,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                InitFloatingWindows() ;
        else
                InitWindows();
-#endif
 #endif
 
        if ( NavServicesAvailable() )
@@ -110,14 +104,16 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                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 )
@@ -588,8 +584,10 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 
+#if !TARGET_CARBON
 static OSStatus helpMenuStatus = noErr ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
+#endif
 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,