applied patch to build wxMSW with CW7 (patch 550445)

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index c1839db1ca66c6da98c592b64c6cf92373e28954..d35787fca95f920ab59ce7ede7bfc63cd9f2c990 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -701,8 +701,7 @@ void wxNativeFontInfo::SetEncoding(
                                   ,&vInfo
                                  ))
     {
                                   ,&vInfo
                                  ))
     {

-#if wxUSE_FONTMAP
-        if (wxTheFontMapper->GetAltForEncoding( eEncoding
+        if (wxFontMapper::Get()->GetAltForEncoding( eEncoding

                                                ,&vInfo
                                               ))
         {
                                                ,&vInfo
                                               ))
         {


@@ -717,7 +716,6 @@ void wxNativeFontInfo::SetEncoding(
             }
         }
         else
             }
         }
         else

-#endif // wxUSE_FONTMAP

         {
             // unsupported encoding, replace with the default
             vInfo.charset = 850;
         {
             // unsupported encoding, replace with the default
             vInfo.charset = 850;