Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 13:36:41 +00:00
parent b4e0b521e0
commit 373a5fb355
10 changed files with 28 additions and 20 deletions
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -578,7 +578,7 @@ void wxNativeFontInfo::SetFaceName(wxString facename)

 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 {
-    int ff_family;
+    BYTE ff_family;
    wxString facename;

    switch ( family )
@@ -647,7 +647,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
        }
    }

-    lf.lfCharSet = info.charset;
+    lf.lfCharSet = (BYTE)info.charset;
 }

 bool wxNativeFontInfo::FromString(const wxString& s)