Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pointer returned by GetNativeFontInfo() is now const and must not be deleted (replaces patch 810192)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-24 01:23:37 +00:00
parent cb0afb2662
commit 3bf5a59b5e
23 changed files with 291 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/motif/font.cpp
View File

@@ -485,14 +485,14 @@ wxFontEncoding wxFont::GetEncoding() const
return M_FONTDATA->m_encoding;
}
wxNativeFontInfo *wxFont::GetNativeFontInfo() const
const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
GetInternalFont();
return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
return &(M_FONTDATA->m_nativeFontInfo);
}
// ----------------------------------------------------------------------------