/////////////////////////////////////////////////////////////////////////////
-// Name: src/mac/carbon/gdiobj.cpp
+// Name: src/osx/carbon/gdiobj.cpp
// Purpose: wxGDIObject class
// Author: Stefan Csomor
// Modified by:
{
}
-extern wxFont* CreateNormalFont();
-extern wxFont* CreateSmallFont();
-
const wxFont* wxStockGDIMac::GetFont(Item item)
{
wxFont* font = static_cast<wxFont*>(ms_stockObject[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;