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

More compilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-08-30 21:06:50 +00:00
parent c222be41e7
commit 3ac35b57a6
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils/configtool/src/utils.cpp
View File

@@ -97,6 +97,14 @@ wxString apFontToString(const wxFont& font)
return str;
}
static inline int StringToInt(const wxString& s)
{
long tmp;
s.ToLong(&tmp);
return int(tmp);
}
// Convert a string to a wxFont
wxFont apStringToFont(const wxString& str)
{
@@ -115,7 +123,7 @@ wxFont apStringToFont(const wxString& str)
if (i == 0)
{
StringToInt(token, & pointSize);
pointSize = StringToInt(token);
#if defined(__WXGTK__) || defined(__WXMAC__)
if (pointSize < 8)
pointSize = 8;
@@ -124,13 +132,13 @@ wxFont apStringToFont(const wxString& str)
#endif
}
else if (i == 1)
StringToInt(token, & family);
family = StringToInt(token);
else if (i == 2)
StringToInt(token, & style);
style = StringToInt(token);
else if (i == 3)
StringToInt(token, & weight);
weight = StringToInt(token);
else if (i == 4)
StringToInt(token, & underlined);
underlined = StringToInt(token);
else if (i == 5)
{
facename = token;