Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode fixes for OS/2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2005-04-27 01:19:43 +00:00
parent 18ed8e0032
commit 0fba44b410
46 changed files with 243 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/os2/font.cpp
View File

@@ -51,7 +51,7 @@ public:
wxFontRefData()
{
Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE,
"", wxFONTENCODING_DEFAULT);
wxEmptyString, wxFONTENCODING_DEFAULT);
}
wxFontRefData( int nSize
@@ -494,7 +494,7 @@ bool wxFontRefData::Alloc(
m_nWeight = wxFONTWEIGHT_NORMAL;
}
m_bUnderlined = ((m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_UNDERSCORE) != 0);
m_sFaceName = m_vNativeFontInfo.fa.szFacename;
m_sFaceName = (wxChar*)m_vNativeFontInfo.fa.szFacename;
m_vEncoding = wxGetFontEncFromCharSet(m_vNativeFontInfo.fa.usCodePage);
//
@@ -582,7 +582,7 @@ bool wxNativeFontInfo::GetUnderlined() const
wxString wxNativeFontInfo::GetFaceName() const
{
return fm.szFacename;
return (wxChar*)fm.szFacename;
} // end of wxNativeFontInfo::GetFaceName
wxFontFamily wxNativeFontInfo::GetFamily() const
@@ -695,7 +695,7 @@ void wxNativeFontInfo::SetFaceName(
wxString sFacename
)
{
wxStrncpy(fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
wxStrncpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
} // end of wxNativeFontInfo::SetFaceName
void wxNativeFontInfo::SetFamily(
@@ -735,7 +735,7 @@ void wxNativeFontInfo::SetFamily(
sFacename = wxT("System VIO") ;
}
if (!wxStrlen(fa.szFacename) )
if (!wxStrlen((wxChar*)fa.szFacename) )
{
SetFaceName(sFacename);
}
@@ -838,7 +838,7 @@ bool wxNativeFontInfo::FromString(
sToken = vTokenizer.GetNextToken();
if(!sToken)
return FALSE;
wxStrcpy(fa.szFacename, sToken.c_str());
wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());
return TRUE;
} // end of wxNativeFontInfo::FromString