fixed warnings after GetFont prototype change

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

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index f9bdf27da26f6bb2e776bed497ca4f477561a979..697557fc6f2c2c143f360deb46d64c1190498f1d 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -3,7 +3,7 @@
 // Purpose:     FTP protocol
 // Author:      Vadim Zeitlin
 // Modified by: Mark Johnson, wxWindows@mj10777.de 
 // Purpose:     FTP protocol
 // Author:      Vadim Zeitlin
 // Modified by: Mark Johnson, wxWindows@mj10777.de 

-//              20000917 : RmDir, GetLastResult, GetList 
+//              20000917 : RmDir, GetLastResult, GetList

 // 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


@@ -13,7 +13,7 @@
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 

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

     #pragma interface "ftp.h"
 #endif
 
     #pragma interface "ftp.h"
 #endif
 


@@ -25,7 +25,7 @@
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 

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

 {
 public:
     enum TransferMode
 {
 public:
     enum TransferMode


@@ -120,11 +120,6 @@ public:
                  const wxString& wildcard = wxEmptyString,
                  bool details = FALSE);
 
                  const wxString& wildcard = wxEmptyString,
                  bool details = FALSE);
 

-#if WXWIN_COMPATIBILITY_2
-    // deprecated
-    wxList *GetList(const wxString& wildcard, bool details = FALSE);
-#endif // WXWIN_COMPATIBILITY_2
-

 protected:
     // this executes a simple ftp command with the given argument and returns
     // TRUE if it its return code starts with '2'
 protected:
     // this executes a simple ftp command with the given argument and returns
     // TRUE if it its return code starts with '2'


@@ -156,7 +151,7 @@ protected:
     friend class wxInputFTPStream;
     friend class wxOutputFTPStream;
 
     friend class wxInputFTPStream;
     friend class wxOutputFTPStream;
 

-    DECLARE_DYNAMIC_CLASS(wxFTP)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFTP)

     DECLARE_PROTOCOL(wxFTP)
 };
 
     DECLARE_PROTOCOL(wxFTP)
 };