don't leave two conscutive separators after "moving" a standard menu item to the...

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index d79b4b74a691bc9b81cffdec94b9e81b999cf1ea..7a718ff004639cffc08ae026b9b6c2b2dcc7b8a3 100644 (file)
--- 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 )
@@ -615,7 +615,7 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
             facename = _T("MS Sans Serif");
     }
 
-    lf.lfPitchAndFamily = DEFAULT_PITCH | ff_family;
+    lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family;
 
     if ( !wxStrlen(lf.lfFaceName) )
     {
@@ -647,7 +647,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
         }
     }
 
-    lf.lfCharSet = info.charset;
+    lf.lfCharSet = (BYTE)info.charset;
 }
 
 bool wxNativeFontInfo::FromString(const wxString& s)