Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*Doh* Forgot a couple minor edits before initial checkin

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1497 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm 2002-10-12 19:07:49 +00:00
parent fc45fe708d
commit 3a93f97d52
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/kits/interface/Font.cpp
View File

@ -37,26 +37,21 @@ BFontPrivate & BFontPrivate::operator=(const BFontPrivate &fontdata)
}
// I think these guys are initialized by the BApplication constructor
BFont *obe_plain_font=NULL;
BFont *obe_bold_font=NULL;
BFont *obe_fixed_font=NULL;
BFont::BFont(void)
{
private_data=new BFontPrivate();
if(be_plain_font)
{
fFamilyID=obe_plain_font->fFamilyID;
fStyleID=obe_plain_font->fStyleID;
fSize=obe_plain_font->fSize;
fShear=obe_plain_font->fShear;
fRotation=obe_plain_font->fRotation;
fSpacing=obe_plain_font->fSpacing;
fEncoding=obe_plain_font->fEncoding;
fFace=obe_plain_font->fFace;
fHeight=obe_plain_font->fHeight;
private_data->fPrivateFlags=obe_plain_font->private_data->fPrivateFlags;
fFamilyID=be_plain_font->fFamilyID;
fStyleID=be_plain_font->fStyleID;
fSize=be_plain_font->fSize;
fShear=be_plain_font->fShear;
fRotation=be_plain_font->fRotation;
fSpacing=be_plain_font->fSpacing;
fEncoding=be_plain_font->fEncoding;
fFace=be_plain_font->fFace;
fHeight=be_plain_font->fHeight;
private_data->fPrivateFlags=be_plain_font->private_data->fPrivateFlags;
}
else
{
@ -108,18 +103,18 @@ BFont::BFont(const BFont *font)
}
else
{
if(obe_plain_font)
if(be_plain_font)
{
fFamilyID=obe_plain_font->fFamilyID;
fStyleID=obe_plain_font->fStyleID;
fSize=obe_plain_font->fSize;
fShear=obe_plain_font->fShear;
fRotation=obe_plain_font->fRotation;
fSpacing=obe_plain_font->fSpacing;
fEncoding=obe_plain_font->fEncoding;
fFace=obe_plain_font->fFace;
fHeight=obe_plain_font->fHeight;
private_data->fPrivateFlags=obe_plain_font->private_data->fPrivateFlags;
fFamilyID=be_plain_font->fFamilyID;
fStyleID=be_plain_font->fStyleID;
fSize=be_plain_font->fSize;
fShear=be_plain_font->fShear;
fRotation=be_plain_font->fRotation;
fSpacing=be_plain_font->fSpacing;
fEncoding=be_plain_font->fEncoding;
fFace=be_plain_font->fFace;
fHeight=be_plain_font->fHeight;
private_data->fPrivateFlags=be_plain_font->private_data->fPrivateFlags;
}
else
{