first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -278,7 +278,9 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
        if ( !wxGetNativeFontEncoding(encoding, &info) ||
             !wxTestFontEncoding(info) )
        {
+#if wxUSE_FONTMAP
            if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+#endif // wxUSE_FONTMAP
            {
                // unspported encoding - replace it with the default
                //