more dnd/clipboard docs

[wxWidgets.git] / src / gtk1 / font.cpp

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 738981520bc338ea0529bd0a15e348d70a315b1c..64ff18c4e87e06466f1f89aad991a57ec0d3c722 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -187,7 +187,7 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
     tn.GetNextToken();                           // pixel size
 
     tmp = tn.GetNextToken();                     // pointsize
-    int num =  wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
+    long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
     M_FONTDATA->m_pointSize = num / 10;
 
     tn.GetNextToken();                           // x-res
@@ -217,7 +217,7 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
     if ( registry == _T("ISO8859") )
     {
         int cp;
-        if ( wxSscanf(encoding, "%d", &cp) == 1 )
+        if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
@@ -226,7 +226,7 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
     else if ( registry == _T("MICROSOFT") )
     {
         int cp;
-        if ( wxSscanf(encoding, "cp125%d", &cp) == 1 )
+        if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
         {
             M_FONTDATA->m_encoding =
                 (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
@@ -394,7 +394,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
     }
 
     long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */
-    int point_scale = (M_FONTDATA->m_pointSize * 10 * int_scale) / 100;
+    int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
     GdkFont *font = (GdkFont *) NULL;
 
     wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);