X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/489468feaa08b8f504735eecca522fb8d0f825d2..6d0d84554854a19db991ba64e7e034e1fc898ef0:/src/osx/carbon/fontdlg.cpp?ds=sidebyside diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp index e7892ad542..bfc19e1386 100644 --- a/src/osx/carbon/fontdlg.cpp +++ b/src/osx/carbon/fontdlg.cpp @@ -42,11 +42,11 @@ #include "wx/fontdlg.h" -#if wxMAC_USE_EXPERIMENTAL_FONTDIALOG +#if wxOSX_USE_EXPERIMENTAL_FONTDIALOG IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // --------------------------------------------------------------------------- // wxFontDialog @@ -73,7 +73,7 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler), case kEventFontSelection : { bool setup = false ; -#if wxMAC_USE_CORE_TEXT +#if wxOSX_USE_CORE_TEXT if ( UMAGetSystemVersion() >= 0x1050 ) { CTFontDescriptorRef descr; @@ -86,7 +86,7 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler), } } #endif -#if wxMAC_USE_ATSU_TEXT +#if wxOSX_USE_ATSU_TEXT ATSUFontID fontId = 0 ; if ( !setup && (cEvent.GetParameter(kEventParamATSUFontID, &fontId) == noErr) ) { @@ -142,7 +142,7 @@ wxMacCarbonFontPanelHandler(EventHandlerCallRef WXUNUSED(nextHandler), fontdata.m_chosenFont.SetWeight(fontStyle & bold ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL); } } -#endif // wxMAC_USE_ATSU_TEXT +#endif // wxOSX_USE_ATSU_TEXT // retrieving the color RGBColor fontColor ; @@ -221,7 +221,7 @@ int wxFontDialog::ShowModal() } bool setup = false; -#if wxMAC_USE_CORE_TEXT +#if wxOSX_USE_CORE_TEXT if ( UMAGetSystemVersion() >= 0x1050 ) { CTFontDescriptorRef descr = (CTFontDescriptorRef)font.MacGetCTFontDescriptor(); @@ -229,7 +229,7 @@ int wxFontDialog::ShowModal() setup = true; } #endif -#if wxMAC_USE_ATSU_TEXT +#if wxOSX_USE_ATSU_TEXT if ( !setup ) { ATSUStyle style = (ATSUStyle)font.MacGetATSUStyle(); @@ -261,7 +261,7 @@ int wxFontDialog::ShowModal() #undef wxFontDialog -#include "wx/mac/fontdlg.h" +#include "wx/osx/fontdlg.h" #include "wx/fontenum.h" #include "wx/colordlg.h" @@ -823,6 +823,6 @@ int FontFamilyStringToInt(const wxChar *family) #endif // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX -#endif // wxMAC_USE_EXPERIMENTAL_FONTDIALOG +#endif // wxOSX_USE_EXPERIMENTAL_FONTDIALOG #endif // wxUSE_FONTDLG