#include "wx/string.h"
#include "wx/utils.h"
#include "wx/intl.h"
+ #include "wx/gdicmn.h"
#endif
#include "wx/fontutil.h"
-#include "wx/gdicmn.h"
-#include "wx/fontutil.h"
+#include "wx/graphics.h"
#include "wx/mac/private.h"
if ( m_macFontStyle & underline )
m_underlined = true ;
m_pointSize = m_macFontSize ;
-
+#ifndef __LP64__
m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
+#endif
}
else
{
{
if ( m_family == wxDEFAULT )
{
+#ifndef __LP64__
m_macFontFamily = GetAppFont();
FMGetFontFamilyName(m_macFontFamily,qdFontName);
m_faceName = wxMacMakeStringFromPascal( qdFontName );
+#endif
}
else
{
m_faceName = wxT("Times");
break ;
}
+#ifndef __LP64__
wxMacStringToPascal( m_faceName , qdFontName );
m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
+#endif
}
}
else
{
+#ifndef __LP64__
if ( m_faceName == wxT("systemfont") )
m_macFontFamily = GetSysFont();
else if ( m_faceName == wxT("applicationfont") )
m_macFontFamily = GetAppFont();
else
+#else
+ if ( m_faceName == wxT("systemfont") )
+ m_faceName = wxT("Lucida Grande");
+ else if ( m_faceName == wxT("applicationfont") )
+ m_faceName = wxT("Lucida Grande");
+#endif
{
wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault );
+ wxASSERT_MSG( atsfamily != (ATSFontFamilyRef) -1 , wxT("ATSFontFamilyFindFromName failed") );
m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily );
}
}
// ATSUFontID and FMFont are equivalent
FMFontStyle intrinsicStyle = 0 ;
+#ifndef __LP64__
status = FMGetFontFromFontFamilyInstance( m_macFontFamily , m_macFontStyle , &m_macATSUFontID , &intrinsicStyle);
wxASSERT_MSG( status == noErr , wxT("couldn't get an ATSUFont from font family") );
-
+#endif
m_macATSUAdditionalQDStyles = m_macFontStyle & (~intrinsicStyle );
if ( m_macATSUStyle )
RealizeResource();
}
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
{
Unshare();
M_FONTDATA->m_faceName = faceName;
RealizeResource();
+
+ return wxFontBase::SetFaceName(faceName);
}
void wxFont::SetUnderlined(bool underlined)
return M_FONTDATA->m_pointSize;
}
+wxSize wxFont::GetPixelSize() const
+{
+#if wxUSE_GRAPHICS_CONTEXT
+ // TODO: consider caching the value
+ wxGraphicsContext* dc = wxGraphicsContext::CreateFromNative((CGContextRef) NULL);
+ dc->SetFont(*(wxFont *)this,*wxBLACK);
+ wxDouble width, height = 0;
+ dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL);
+ return wxSize((int)width, (int)height);
+#else
+ wxFontBase::GetPixelSize();
+#endif
+}
+
int wxFont::GetFamily() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );