#pragma hdrstop
#endif
+#include "wx/fontutil.h"
+
#ifndef WX_PRECOMP
+ #include "wx/app.h"
#include "wx/font.h" // wxFont enums
#include "wx/encinfo.h"
#include "wx/hash.h"
#include "wx/utils.h" // for wxGetDisplay()
#endif // PCH
-#include "wx/fontutil.h"
#include "wx/fontmap.h"
#include "wx/tokenzr.h"
#include "wx/module.h"
+#include "wx/fontenum.h"
#if wxUSE_PANGO
wxFAIL_MSG( _T("not implemented") );
}
-void wxNativeFontInfo::SetFaceName(const wxString& facename)
+bool wxNativeFontInfo::SetFaceName(const wxString& facename)
{
pango_font_description_set_family(description, wxGTK_CONV_SYS(facename));
+ return true;
}
void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
description = pango_font_description_from_string( wxGTK_CONV_SYS( str ) );
+ // ensure a valid facename is selected
+ if (!wxFontEnumerator::IsValidFacename(GetFaceName()))
+ SetFaceName(wxNORMAL_FONT->GetFaceName());
+
return true;
}
// can't do this under X
}
-void wxNativeFontInfo::SetFaceName(const wxString& facename)
+bool wxNativeFontInfo::SetFaceName(const wxString& facename)
{
SetXFontComponent(wxXLFD_FAMILY, facename);
+ return true;
}
void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))