wxFontEnumerator::GetFacenames/Encodings() now return arrays and not pointers to them (patch 1483341)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1281,18 +1281,14 @@ void wxHtmlHelpWindow::OptionsDialog()
|
||||
|
||||
if (m_NormalFonts == NULL)
|
||||
{
|
||||
wxFontEnumerator enu;
|
||||
enu.EnumerateFacenames();
|
||||
m_NormalFonts = new wxArrayString;
|
||||
*m_NormalFonts = *enu.GetFacenames();
|
||||
m_NormalFonts = new wxArrayString(wxFontEnumerator::GetFacenames());
|
||||
m_NormalFonts->Sort(); // ascending sort
|
||||
}
|
||||
if (m_FixedFonts == NULL)
|
||||
{
|
||||
wxFontEnumerator enu;
|
||||
enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, true /*enum fixed width only*/);
|
||||
m_FixedFonts = new wxArrayString;
|
||||
*m_FixedFonts = *enu.GetFacenames();
|
||||
m_FixedFonts = new wxArrayString(
|
||||
wxFontEnumerator::GetFacenames(wxFONTENCODING_SYSTEM,
|
||||
true /*enum fixed width only*/));
|
||||
m_FixedFonts->Sort(); // ascending sort
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user