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

removing 10.5 version checks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-12-23 19:28:03 +00:00
parent a8da90b853
commit b97d6fb118
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osx/carbon/fontdlg.cpp
View File

@@ -78,7 +78,7 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler),
{ {
bool setup = false ; bool setup = false ;
#if wxOSX_USE_CORE_TEXT #if wxOSX_USE_CORE_TEXT
if ( UMAGetSystemVersion() >= 0x1050 ) if ( !setup )
{ {
CTFontDescriptorRef descr; CTFontDescriptorRef descr;
if ( cEvent.GetParameter<CTFontDescriptorRef>( kEventParamCTFontDescriptor, typeCTFontDescriptorRef, &descr ) == noErr ) if ( cEvent.GetParameter<CTFontDescriptorRef>( kEventParamCTFontDescriptor, typeCTFontDescriptorRef, &descr ) == noErr )
@@ -243,7 +243,7 @@ int wxFontDialog::ShowModal()
bool setup = false; bool setup = false;
#if wxOSX_USE_CORE_TEXT #if wxOSX_USE_CORE_TEXT
if ( UMAGetSystemVersion() >= 0x1050 ) if ( !setup )
{ {
CTFontDescriptorRef descr = (CTFontDescriptorRef) CTFontCopyFontDescriptor( (CTFontRef) font.OSXGetCTFont() ); CTFontDescriptorRef descr = (CTFontDescriptorRef) CTFontCopyFontDescriptor( (CTFontRef) font.OSXGetCTFont() );
err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL); err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL);