More warnings/minor fixes

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@836 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2008-04-06 18:08:32 +00:00
parent 8c84621715
commit e6f466933d
23 changed files with 48 additions and 45 deletions
+1 -1
View File
@@ -88,7 +88,7 @@ wxFont Font::toWxFont(double scale) const {
}
} else if (name().empty()) {
font = *wxNORMAL_FONT;
font.SetPointSize(size > 1 ? size_i : scale * font.GetPointSize());
font.SetPointSize(size > 1 ? size_i : int(scale * font.GetPointSize()));
return font;
} else if (flags & FONT_ITALIC && !italic_name().empty()) {
font = wxFont(size_i, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, weight_i, underline(), italic_name());