From 4a6a2972a218d918bebf46331d2bb2eb8ccaeb69 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 11 Feb 2004 06:50:10 +0000 Subject: [PATCH] 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 --- src/mac/carbon/uma.cpp | 12 ++++++++---- src/mac/uma.cpp | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index faae84417b..48a7599f04 100644 --- 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) ; -#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 - 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 diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp index faae84417b..48a7599f04 100644 --- 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) ; -#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 - 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 -- 2.47.2