X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae391295217ea32f0e56b4dc48d67f8487d02c20..acd32ffcdb319f162633c20e0202db3f8542998a:/src/x11/font.cpp?ds=sidebyside diff --git a/src/x11/font.cpp b/src/x11/font.cpp index e29187f742..7e3ec5f6dc 100644 --- a/src/x11/font.cpp +++ b/src/x11/font.cpp @@ -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;