don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -777,7 +777,7 @@ bool wxFont::GetNoAntiAliasing() const
|
||||
|
||||
const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
|
||||
{
|
||||
wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
|
||||
wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
#else
|
||||
@@ -892,7 +892,7 @@ void wxFont::SetNoAntiAliasing( bool no )
|
||||
wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
|
||||
{
|
||||
if ( !Ok() )
|
||||
return (wxXFont *)NULL;
|
||||
return NULL;
|
||||
|
||||
long intScale = long(scale * 100.0 + 0.5); // key for wxXFont
|
||||
int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
|
||||
@@ -927,7 +927,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
|
||||
{
|
||||
wxFAIL_MSG( wxT("Could not allocate even a default font -- something is wrong.") );
|
||||
|
||||
return (wxXFont*) NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
wxXFont* f = new wxXFont;
|
||||
|
||||
Reference in New Issue
Block a user