pointer returned by GetNativeFontInfo() is now const and must not be deleted (replaces patch 810192)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -790,7 +790,7 @@ bool wxFont::GetNoAntiAliasing()
 | 
			
		||||
    return M_FONTDATA->m_noAA;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 | 
			
		||||
const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 | 
			
		||||
{
 | 
			
		||||
    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 | 
			
		||||
 | 
			
		||||
@@ -799,7 +799,7 @@ wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 | 
			
		||||
        GetInternalFont();
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
 | 
			
		||||
    return &(M_FONTDATA->m_nativeFontInfo);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool wxFont::IsFixedWidth() const
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user