#include "wx/font.h"
#include "wx/gdicmn.h"
+#include "wx/fontutil.h"
+
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
#endif
-
-
-
// ============================================================================
// implementation
// ============================================================================
::GetFNum( "\pTimes" , &m_macFontNum) ;
break ;
case wxSWISS :
- ::GetFNum( "\pHelvetica" , &m_macFontNum) ;
+ ::GetFNum( "\pGeneva" , &m_macFontNum) ;
break ;
case wxMODERN :
::GetFNum( "\pMonaco" , &m_macFontNum) ;
wxTheFontList->Append(this);
}
+wxFont::wxFont(const wxString& fontdesc)
+{
+ wxNativeFontInfo info;
+ if ( info.FromString(fontdesc) )
+ (void)Create(info);
+}
+
bool wxFont::Create(int pointSize,
int family,
int style,
return TRUE;
}
+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+ return Create(info.pointSize, info.family, info.style, info.weight,
+ info.underlined, info.faceName, info.encoding);
+}
+
wxFont::~wxFont()
{
if (wxTheFontList)