fixes for moving wxHTML files into their own DLL

[wxWidgets.git] / include / wx / protocol / ftp.h

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index d687b59e415c7306d34a67f9c0c4d7c668ec6d27..f9bdf27da26f6bb2e776bed497ca4f477561a979 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -7,22 +7,25 @@
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // 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__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "ftp.h"
 #endif
 
     #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"
 
 #include "wx/sckaddr.h"
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 

-class WXDLLEXPORT wxFTP : public wxProtocol
+class WXDLLIMPEXP_BASE wxFTP : public wxProtocol

 {
 public:
     enum TransferMode
 {
 public:
     enum TransferMode


@@ -117,7 +120,7 @@ public:
                  const wxString& wildcard = wxEmptyString,
                  bool details = FALSE);
 
                  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
     // 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")
 
 // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output
 #define FTP_TRACE_MASK _T("ftp")
 

+#endif // wxUSE_PROTOCOL_FTP
+

 #endif // __WX_FTP_H__
 #endif // __WX_FTP_H__