minor fixes for the font info patch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 4322827f0a9f26649e790b81b5e42813e95aeabb..4736134731a22f7d6af0934d21768207a0a476c1 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -138,8 +138,8 @@ enum
     Font_EnumFamilies,
     Font_EnumFixedFamilies,
     Font_EnumEncodings,
-    Font_CheckNativeToFromString
-    Font_Max,
+    Font_CheckNativeToFromString,
+    Font_Max
 };
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 812c56c42c473c0777c75e5afb78d03a6e6ab90c..c1eec3bd2519963ec3ffaaf773947fefa839a984 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -195,7 +195,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
-    underlined = (int)l;
+    underlined = l != 0;
 
     faceName = tokenizer.GetNextToken();
     if( !faceName )