X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2680ced12cbbed16990007c5fa3ea7730700122..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/osx/carbon/gdiobj.cpp?ds=sidebyside diff --git a/src/osx/carbon/gdiobj.cpp b/src/osx/carbon/gdiobj.cpp index 81fb05c458..4a7a3db352 100644 --- a/src/osx/carbon/gdiobj.cpp +++ b/src/osx/carbon/gdiobj.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mac/carbon/gdiobj.cpp +// Name: src/osx/carbon/gdiobj.cpp // Purpose: wxGDIObject class // Author: Stefan Csomor // Modified by: @@ -51,9 +51,6 @@ void wxStockGDIMac::OnExit() { } -extern wxFont* CreateNormalFont(); -extern wxFont* CreateSmallFont(); - const wxFont* wxStockGDIMac::GetFont(Item item) { wxFont* font = static_cast<wxFont*>(ms_stockObject[item]); @@ -61,23 +58,12 @@ const wxFont* wxStockGDIMac::GetFont(Item item) { switch (item) { -#if wxOSX_USE_COCOA_OR_CARBON - case FONT_NORMAL: - font = new wxFont; - font->MacCreateFromThemeFont(kThemeSystemFont); - break; - case FONT_SMALL: - font = new wxFont; - font->MacCreateFromThemeFont(kThemeSmallSystemFont); - break; -#else case FONT_NORMAL: - font = CreateNormalFont() ; + font = new wxFont(wxOSX_SYSTEM_FONT_NORMAL); break; case FONT_SMALL: - font = CreateSmallFont(); + font = new wxFont(wxOSX_SYSTEM_FONT_SMALL); break; -#endif default: font = const_cast<wxFont*>(super::GetFont(item)); break;