Lots of updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-10 04:38:11 +00:00
parent f4f734c1ef
commit a086de984d
12 changed files with 199 additions and 170 deletions
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -701,7 +701,6 @@ void wxNativeFontInfo::SetEncoding(
                                  ,&vInfo
                                 ))
    {
-#if wxUSE_FONTMAP
        if (wxFontMapper::Get()->GetAltForEncoding( eEncoding
                                               ,&vInfo
                                              ))
@@ -717,7 +716,6 @@ void wxNativeFontInfo::SetEncoding(
            }
        }
        else
-#endif // wxUSE_FONTMAP
        {
            // unsupported encoding, replace with the default
            vInfo.charset = 850;