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

Weekly catchup as well as better font and fontdlg support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-08-19 02:28:02 +00:00
parent c93f804a15
commit a23692f070
8 changed files with 207 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/os2/font.cpp
View File

@@ -348,14 +348,19 @@ void wxFontRefData::Init(
m_bNativeFontInfoOk = TRUE;
m_vNativeFontInfo = rInfo;
if (m_hPS == NULLHANDLE)
if (hPS == NULLHANDLE)
{
m_hPS = ::WinGetPS(HWND_DESKTOP);
m_bInternalPS = TRUE;
}
else
m_hPS = (HPS)hPS;
}
m_nFontId = 0;
m_bTemporary = FALSE;
m_pFM = (PFONTMETRICS)NULL;
m_nNumFonts = 0;
} // end of wxFontRefData::Init
wxFontRefData::~wxFontRefData()
{
@@ -449,11 +454,11 @@ bool wxFontRefData::Alloc(
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
m_nFamily = wxTELETYPE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
m_nFamily = wxTELETYPE;
m_nFamily = wxDEFAULT;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
m_nFamily = wxMODERN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
m_nFamily = wxMODERN;
m_nFamily = wxSWISS;
else
m_nFamily = wxSWISS;
@@ -608,11 +613,11 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
nFamily = wxTELETYPE;
else if (strcmp(fm.szFamilyname, "System VIO") == 0)
nFamily = wxTELETYPE;
nFamily = wxDEFAULT;
else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
nFamily = wxMODERN;
else if (strcmp(fm.szFamilyname, "Arial") == 0)
nFamily = wxMODERN;
nFamily = wxSWISS;
else
nFamily = wxSWISS;
return (wxFontFamily)nFamily;
@@ -714,7 +719,7 @@ void wxNativeFontInfo::SetFamily(
break;
case wxMODERN:
sFacename = wxT("Arial") ;
sFacename = wxT("Courier New") ;
break;
case wxSWISS:
@@ -723,7 +728,7 @@ void wxNativeFontInfo::SetFamily(
case wxDEFAULT:
default:
sFacename = wxT("System Proportional") ;
sFacename = wxT("System VIO") ;
}
if (!wxStrlen(fa.szFacename) )