Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added mlte initialization

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-05-08 23:23:43 +00:00
parent 1b2b1638a2
commit f8eebb9543
2 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mac/carbon/uma.cpp
View File

@@ -21,9 +21,6 @@
// windows manager, control manager, navigation services etc. are // windows manager, control manager, navigation services etc. are
// present // present
#define wxUSE_MLTE 0
static bool sUMAHasAppearance = false ; static bool sUMAHasAppearance = false ;
static long sUMAAppearanceVersion = 0 ; static long sUMAAppearanceVersion = 0 ;
static bool sUMAHasAquaLayout = false ; static bool sUMAHasAquaLayout = false ;
@@ -51,9 +48,8 @@ void UMACleanupToolbox()
{ {
NavUnload() ; NavUnload() ;
} }
#if wxUSE_MLTE if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
TXNTerminateTextension( ) ; TXNTerminateTextension( ) ;
#endif
} }
void UMAInitToolbox( UInt16 inMoreMastersCalls ) void UMAInitToolbox( UInt16 inMoreMastersCalls )
{ {
@@ -108,14 +104,16 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
NavLoad() ; NavLoad() ;
} }
#if wxUSE_MLTE if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
TXNMacOSPreferredFontDescription defaults; {
defaults.fontID = kFontIDGeneva ; TXNMacOSPreferredFontDescription defaults;
defaults.pointSize = (10 << 16) ; defaults.fontID = kFontIDGeneva ;
defaults.fontStyle = kTXNDefaultFontStyle; defaults.pointSize = (10 << 16) ;
defaults.encoding = kTXNSystemDefaultEncoding; defaults.fontStyle = kTXNDefaultFontStyle;
TXNInitTextension(&defaults, 1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask)); defaults.encoding = kTXNSystemDefaultEncoding;
#endif TXNInitTextension(&defaults, 1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
}
long menuMgrAttr ; long menuMgrAttr ;
Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ; Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask ) if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )

26
src/mac/uma.cpp
View File

@@ -21,9 +21,6 @@
// windows manager, control manager, navigation services etc. are // windows manager, control manager, navigation services etc. are
// present // present
#define wxUSE_MLTE 0
static bool sUMAHasAppearance = false ; static bool sUMAHasAppearance = false ;
static long sUMAAppearanceVersion = 0 ; static long sUMAAppearanceVersion = 0 ;
static bool sUMAHasAquaLayout = false ; static bool sUMAHasAquaLayout = false ;
@@ -51,9 +48,8 @@ void UMACleanupToolbox()
{ {
NavUnload() ; NavUnload() ;
} }
#if wxUSE_MLTE if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
TXNTerminateTextension( ) ; TXNTerminateTextension( ) ;
#endif
} }
void UMAInitToolbox( UInt16 inMoreMastersCalls ) void UMAInitToolbox( UInt16 inMoreMastersCalls )
{ {
@@ -108,14 +104,16 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
NavLoad() ; NavLoad() ;
} }
#if wxUSE_MLTE if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
TXNMacOSPreferredFontDescription defaults; {
defaults.fontID = kFontIDGeneva ; TXNMacOSPreferredFontDescription defaults;
defaults.pointSize = (10 << 16) ; defaults.fontID = kFontIDGeneva ;
defaults.fontStyle = kTXNDefaultFontStyle; defaults.pointSize = (10 << 16) ;
defaults.encoding = kTXNSystemDefaultEncoding; defaults.fontStyle = kTXNDefaultFontStyle;
TXNInitTextension(&defaults, 1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask)); defaults.encoding = kTXNSystemDefaultEncoding;
#endif TXNInitTextension(&defaults, 1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
}
long menuMgrAttr ; long menuMgrAttr ;
Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ; Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask ) if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )