From 1447a23c83508f8cc2c57b33a024a58502ba3cfc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 12 Sep 2014 11:31:25 +0000 Subject: [PATCH] Accept "default" as font family value in XRC. Map it to wxFONTFAMILY_DEFAULT, just as we do for all other wxFontFamily enum elements. Closes #16549. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/doxygen/overviews/xrc_format.h | 4 ++-- src/xrc/xmlres.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index 1dea97dfbb..3dbe40ef15 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -401,8 +401,8 @@ and can be one of the following "sub-properties": @row3col{weight, enum, One of "normal", "bold" or "light" (default: normal).} @row3col{family, enum, - One of "roman", "script", "decorative", "swiss", "modern" or "teletype" - (default: roman).} + One of "default", "roman", "script", "decorative", "swiss", "modern" or "teletype" + (default: default).} @row3col{underlined, @ref overview_xrcformat_type_bool, Whether the font should be underlined (default: 0).} @row3col{face, , diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 601dab6e3f..3c5e991371 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -2285,7 +2285,8 @@ wxFont wxXmlResourceHandlerImpl::GetFont(const wxString& param, wxWindow* parent if (hasFamily) { wxString family = GetParamValue(wxT("family")); - if (family == wxT("decorative")) ifamily = wxFONTFAMILY_DECORATIVE; + if (family == wxT("default")) ifamily = wxFONTFAMILY_DEFAULT; + else if (family == wxT("decorative")) ifamily = wxFONTFAMILY_DECORATIVE; else if (family == wxT("roman")) ifamily = wxFONTFAMILY_ROMAN; else if (family == wxT("script")) ifamily = wxFONTFAMILY_SCRIPT; else if (family == wxT("swiss")) ifamily = wxFONTFAMILY_SWISS;