set enc to wxUnusedVar in unicode mode, remove the old ugly code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -563,13 +563,12 @@ bool wxFont::Create(int pointSize,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxFont::Create(const wxString& fontname,
|
bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
|
||||||
#if wxUSE_UNICODE
|
|
||||||
wxFontEncoding WXUNUSED(enc))
|
|
||||||
#else
|
|
||||||
wxFontEncoding enc)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
|
#if wxUSE_UNICODE
|
||||||
|
wxUnusedVar(enc);
|
||||||
|
#endif
|
||||||
|
|
||||||
if( !fontname )
|
if( !fontname )
|
||||||
{
|
{
|
||||||
*this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
|
*this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
|
||||||
|
Reference in New Issue
Block a user