tons of wxFTP fixes and compilation fix for wxBase

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-19 16:56:27 +00:00
parent dda88f5eee
commit 2e907fab47
5 changed files with 587 additions and 298 deletions
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -34,7 +34,6 @@
    #include "wx/intl.h"
 #endif // PCH

-#include "wx/fontutil.h"
 #include "wx/fontmap.h"

 #if wxUSE_CONFIG
@@ -43,6 +42,7 @@
 #endif

 #if wxUSE_GUI
+    #include "wx/fontutil.h"
    #include "wx/msgdlg.h"
    #include "wx/fontdlg.h"
    #include "wx/choicdlg.h"