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

Font updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-08-22 01:02:37 +00:00
parent 49218ee6c9
commit 1b75810c8d
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/os2/private.h
View File

@@ -267,6 +267,10 @@ WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd); WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font); WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
WXDLLEXPORT void wxConvertVectorFontSize( FIXED fxPointSize
,PFATTRS pFattrs
);
WXDLLEXPORT void wxFillLogFont( LOGFONT* pLogFont WXDLLEXPORT void wxFillLogFont( LOGFONT* pLogFont
,PFACENAMEDESC pFaceName ,PFACENAMEDESC pFaceName
,HPS* phPS ,HPS* phPS

4
src/common/gdicmn.cpp
View File

@@ -466,7 +466,7 @@ void wxInitializeStockObjects ()
p2cstrcpy( (char*) fontName , fontName ) ; p2cstrcpy( (char*) fontName , fontName ) ;
wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName ); wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName );
#elif defined(__WXPM__) #elif defined(__WXPM__)
static const int sizeFont = 10; static const int sizeFont = 12;
#else #else
wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
static const int sizeFont = wxNORMAL_FONT->GetPointSize(); static const int sizeFont = wxNORMAL_FONT->GetPointSize();
@@ -478,7 +478,7 @@ void wxInitializeStockObjects ()
// as I can do to get something that looks halfway "wx" normal // as I can do to get something that looks halfway "wx" normal
*/ */
wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD); wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
#elif defined(__WXMAC__) #elif defined(__WXMAC__)

16
src/os2/font.cpp
View File

@@ -454,11 +454,13 @@ bool wxFontRefData::Alloc(
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0) else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
m_nFamily = wxTELETYPE; m_nFamily = wxTELETYPE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0) else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
m_nFamily = wxDEFAULT; m_nFamily = wxMODERN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0) else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
m_nFamily = wxMODERN; m_nFamily = wxMODERN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0) else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
m_nFamily = wxSWISS; m_nFamily = wxSWISS;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
m_nFamily = wxSWISS;
else else
m_nFamily = wxSWISS; m_nFamily = wxSWISS;
@@ -613,11 +615,13 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
else if (strcmp(fm.szFamilyname, "System Monospaced") == 0) else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
nFamily = wxTELETYPE; nFamily = wxTELETYPE;
else if (strcmp(fm.szFamilyname, "System VIO") == 0) else if (strcmp(fm.szFamilyname, "System VIO") == 0)
nFamily = wxDEFAULT; nFamily = wxMODERN;
else if (strcmp(fm.szFamilyname, "System Proportional") == 0) else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
nFamily = wxMODERN; nFamily = wxMODERN;
else if (strcmp(fm.szFamilyname, "Arial") == 0) else if (strcmp(fm.szFamilyname, "Arial") == 0)
nFamily = wxSWISS; nFamily = wxSWISS;
else if (strcmp(fm.szFamilyname, "Swiss") == 0)
nFamily = wxSWISS;
else else
nFamily = wxSWISS; nFamily = wxSWISS;
return (wxFontFamily)nFamily; return (wxFontFamily)nFamily;
@@ -703,7 +707,7 @@ void wxNativeFontInfo::SetFamily(
switch (eFamily) switch (eFamily)
{ {
case wxSCRIPT: case wxSCRIPT:
sFacename = wxT("Script"); sFacename = wxT("Tms Rmn");
break; break;
case wxDECORATIVE: case wxDECORATIVE:
@@ -711,15 +715,15 @@ void wxNativeFontInfo::SetFamily(
break; break;
case wxROMAN: case wxROMAN:
sFacename = wxT("Times New Roman"); sFacename = wxT("Tms Rmn");
break; break;
case wxTELETYPE: case wxTELETYPE:
sFacename = wxT("Courier New") ; sFacename = wxT("Courier") ;
break; break;
case wxMODERN: case wxMODERN:
sFacename = wxT("Courier New") ; sFacename = wxT("System VIO") ;
break; break;
case wxSWISS: case wxSWISS:

8
src/os2/fontutil.cpp
View File

@@ -487,7 +487,7 @@ void wxOS2SelectMatchingFontByName(
switch (pFont->GetFamily()) switch (pFont->GetFamily())
{ {
case wxSCRIPT: case wxSCRIPT:
sFaceName = wxT("Script"); sFaceName = wxT("Tms Rmn");
break; break;
case wxDECORATIVE: case wxDECORATIVE:
@@ -495,15 +495,15 @@ void wxOS2SelectMatchingFontByName(
break; break;
case wxROMAN: case wxROMAN:
sFaceName = wxT("Times New Roman"); sFaceName = wxT("Tms Rmn");
break; break;
case wxTELETYPE: case wxTELETYPE:
sFaceName = wxT("Courier New") ; sFaceName = wxT("Courier") ;
break; break;
case wxMODERN: case wxMODERN:
sFaceName = wxT("Courier New") ; sFaceName = wxT("System VIO") ;
break; break;
case wxSWISS: case wxSWISS: