turning off sound, movies and images for textctrl

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index faae84417b89d3488832dd5c079ff1487287990c..48a7599f0498516d78909c41e5b9d15b0e95d719 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -164,11 +164,15 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
         { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
         { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;

-#if 0 // TARGET_CARBON
-    --noOfFontDescriptions ;
-#endif
+

       // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
       // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke

-      OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+#if 0
+    // leads to unexpected content for clients, TODO configurable
+    OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+#else
+    OptionBits options = 0 ;
+#endif
+

 #if TARGET_CARBON
     if ( !UMAHasAquaLayout() )
 #endif
 #if TARGET_CARBON
     if ( !UMAHasAquaLayout() )
 #endif

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index faae84417b89d3488832dd5c079ff1487287990c..48a7599f0498516d78909c41e5b9d15b0e95d719 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -164,11 +164,15 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
         { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
         { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;

-#if 0 // TARGET_CARBON
-    --noOfFontDescriptions ;
-#endif
+

       // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
       // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke

-      OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+#if 0
+    // leads to unexpected content for clients, TODO configurable
+    OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+#else
+    OptionBits options = 0 ;
+#endif
+

 #if TARGET_CARBON
     if ( !UMAHasAquaLayout() )
 #endif
 #if TARGET_CARBON
     if ( !UMAHasAquaLayout() )
 #endif