AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Child positioning fixes and font adjustments

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2002-01-25 04:48:36 +00:00
parent 9866d9c299
commit 2c1e8f2ec2
4 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/os2/button.cpp
View File

@ -100,7 +100,14 @@ bool wxButton::Create(
// Subclass again for purposes of dialog editing mode
//
SubclassWin(m_hWnd);
SetFont(*wxSMALL_FONT);
wxFont* pButtonFont = new wxFont( 8
,wxSWISS
,wxNORMAL
,wxNORMAL
);
SetFont(*pButtonFont);
SetXComp(0);
SetYComp(0);
SetSize( rPos.x
,rPos.y
,rSize.x

17
src/os2/font.cpp
View File

@ -108,8 +108,13 @@ public:
//
inline int GetPointSize(void) const
{
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetPointSize()
: m_nPointSize;
//
// We don't use the actual native font point size since it is
// the chosen physical font, which is usually only and approximation
// of the desired outline font. The actual displayable point size
// is the one stored in the refData
//
return m_nPointSize;
}
inline int GetFamily(void) const
@ -402,7 +407,13 @@ bool wxFontRefData::Alloc(
//
memcpy(&m_vFattrs, &m_vNativeFontInfo.fa, sizeof(m_vFattrs));
memcpy(&m_vFname, &m_vNativeFontInfo.fn, sizeof(m_vFname));
m_nPointSize = m_vNativeFontInfo.fm.lEmHeight;
//
// Going to leave the point size alone. Mostly we use outline fonts
// that can be set to any point size inside of Presentation Parameters,
// regardless of whether or not the actual font is registered in the system.
// The GpiCreateLogFont will do enough by selecting the right family,
// and face name.
//
if (strcmp(m_vNativeFontInfo.fa.szFacename, "Times New Roman") == 0)
m_nFamily = wxROMAN;
else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Tms Rmn") == 0)

7
src/os2/textctrl.cpp
View File

@ -208,7 +208,12 @@ bool wxTextCtrl::Create(
//
// Set font, position, size and initial value
//
SetFont(*wxSMALL_FONT);
wxFont* pTextFont = new wxFont( 10
,wxMODERN
,wxNORMAL
,wxNORMAL
);
SetFont(*pTextFont);
if (!rsValue.IsEmpty())
{
SetValue(rsValue);

4
src/os2/utils.cpp
View File

@ -1241,7 +1241,7 @@ void wxOS2SetFont(
break;
case wxMODERN:
strcpy(zFacename, "System Vio");
strcpy(zFacename, "System VIO");
break;
case wxSWISS:
@ -1250,7 +1250,7 @@ void wxOS2SetFont(
case wxDEFAULT:
default:
strcpy(zFacename, "System Vio");
strcpy(zFacename, "System VIO");
break;
}