projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Took out somebody's hard coded path (j:\dev\something...) and put back
[wxWidgets.git]
/
src
/
gtk
/
font.cpp
diff --git
a/src/gtk/font.cpp
b/src/gtk/font.cpp
index c2e51daba65cbb3e3fc15bfbab7fe42afe9d9e37..a957f4f68ae6fe08227e0e3d5a12a0bc9f42f4e2 100644
(file)
--- a/
src/gtk/font.cpp
+++ b/
src/gtk/font.cpp
@@
-29,7
+29,7
@@
#include <strings.h>
#include <strings.h>
-#include
"gdk/gdk.h"
+#include
<gdk/gdk.h>
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
// wxFontRefData
@@
-188,7
+188,7
@@
wxFont::wxFont( const wxString& fontname, const wxFontData& fontdata )
tmp = tn.GetNextToken(); // pointsize
long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
tmp = tn.GetNextToken(); // pointsize
long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
- M_FONTDATA->m_pointSize =
num / 10
;
+ M_FONTDATA->m_pointSize =
(int)(num / 10)
;
tn.GetNextToken(); // x-res
tn.GetNextToken(); // y-res
tn.GetNextToken(); // x-res
tn.GetNextToken(); // y-res