X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f2bcf34371665165e8232c7fdf3776cfff11892..b71e94da10e5f6db42ad10182655450b11ebda2f:/include/wx/protocol/ftp.h?ds=inline

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index d687b59e41..c76355b1da 100644
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -7,17 +7,20 @@
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "ftp.h"
 #endif
 
-#include "wx/object.h"
+#include "wx/defs.h"
+
+#if wxUSE_PROTOCOL_FTP
+
 #include "wx/sckaddr.h"
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
@@ -117,7 +120,7 @@ public:
                  const wxString& wildcard = wxEmptyString,
                  bool details = FALSE);
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
     // deprecated
     wxList *GetList(const wxString& wildcard, bool details = FALSE);
 #endif // WXWIN_COMPATIBILITY_2
@@ -161,4 +164,6 @@ protected:
 // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output
 #define FTP_TRACE_MASK _T("ftp")
 
+#endif // wxUSE_PROTOCOL_FTP
+
 #endif // __WX_FTP_H__