X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..0cc70962a1771fb53c1208648ca46c6185699fd2:/src/os2/font.cpp diff --git a/src/os2/font.cpp b/src/os2/font.cpp index f4077c70f8..6c7507082e 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.cpp +// Name: src/os2/font.cpp // Purpose: wxFont class // Author: David Webster // Modified by: @@ -22,7 +22,6 @@ #ifndef WX_PRECOMP #include - #include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" @@ -691,7 +690,7 @@ void wxNativeFontInfo::SetUnderlined( } // end of wxNativeFontInfo::SetUnderlined void wxNativeFontInfo::SetFaceName( - wxString sFacename + const wxString& sFacename ) { wxStrncpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename)); @@ -861,10 +860,6 @@ wxString wxNativeFontInfo::ToString() const // wxFont // ---------------------------------------------------------------------------- -void wxFont::Init() -{ -} // end of wxFont::Init - bool wxFont::Create( const wxNativeFontInfo& rInfo, WXHFONT hFont ) { @@ -1115,7 +1110,7 @@ bool wxFont::GetUnderlined() const wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") ); + wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->GetFaceName(); } // end of wxFont::GetFaceName