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

7
src/os2/font.cpp
View File

@@ -1140,11 +1140,10 @@ wxFontEncoding wxFont::GetEncoding() const
return M_FONTDATA->GetEncoding();
} // end of wxFont::GetEncoding
wxNativeFontInfo* wxFont::GetNativeFontInfo() const
const wxNativeFontInfo* wxFont::GetNativeFontInfo() const
{
if (M_FONTDATA->HasNativeFontInfo())
return new wxNativeFontInfo(M_FONTDATA->GetNativeFontInfo());
return 0;
return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
: NULL;
} // end of wxFont::GetNativeFontInfo
//