Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index f9489fefc7eb59aa0f65b01e60854560bc9a166b..a87a63806640d2de67c47d1f80a94040a166009c 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        ftp.h
+// Name:        wx/protocol/ftp.h

 // Purpose:     FTP protocol
 // Author:      Vadim Zeitlin
 // Modified by: Mark Johnson, wxWindows@mj10777.de
 //              20000917 : RmDir, GetLastResult, GetList
 // Created:     07/07/1997
 // Purpose:     FTP protocol
 // Author:      Vadim Zeitlin
 // Modified by: Mark Johnson, wxWindows@mj10777.de
 //              20000917 : RmDir, GetLastResult, GetList
 // Created:     07/07/1997

-// RCS-ID:      $Id$

 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -35,8 +34,9 @@ public:
     virtual ~wxFTP();
 
     // Connecting and disconnecting
     virtual ~wxFTP();
 
     // Connecting and disconnecting

-    bool Connect(const wxSockAddress& addr, bool wait = true);
-    bool Connect(const wxString& host);
+    virtual bool Connect(const wxSockAddress& addr, bool wait = true);
+    virtual bool Connect(const wxString& host) { return Connect(host, 0); }
+    virtual bool Connect(const wxString& host, unsigned short port);

 
     // disconnect
     virtual bool Close();
 
     // disconnect
     virtual bool Close();


@@ -80,7 +80,7 @@ public:
     // this function tries its best to deliver the size in bytes using BINARY
     // (the SIZE command reports different sizes depending on whether
     // type is set to ASCII or BINARY)
     // this function tries its best to deliver the size in bytes using BINARY
     // (the SIZE command reports different sizes depending on whether
     // type is set to ASCII or BINARY)

-    // returns -1 if file is non-existant or size could not be found
+    // returns -1 if file is non-existent or size could not be found

     int GetFileSize(const wxString& fileName);
 
        // Check to see if a file exists in the current dir
     int GetFileSize(const wxString& fileName);
 
        // Check to see if a file exists in the current dir


@@ -138,7 +138,7 @@ protected:
     wxString GetPortCmdArgument(const wxIPV4address& Local, const wxIPV4address& New);
 
     // accept connection from server in active mode, returns the same socket as
     wxString GetPortCmdArgument(const wxIPV4address& Local, const wxIPV4address& New);
 
     // accept connection from server in active mode, returns the same socket as

-    // passed in in passive mode
+    // passed in passive mode

     wxSocketBase *AcceptIfActive(wxSocketBase *sock);
 
 
     wxSocketBase *AcceptIfActive(wxSocketBase *sock);
 
 


@@ -169,7 +169,7 @@ protected:
 
 // the trace mask used by assorted wxLogTrace() in ftp code, do
 // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output
 
 // the trace mask used by assorted wxLogTrace() in ftp code, do
 // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output

-#define FTP_TRACE_MASK _T("ftp")
+#define FTP_TRACE_MASK wxT("ftp")

 
 #endif // wxUSE_PROTOCOL_FTP
 
 
 #endif // wxUSE_PROTOCOL_FTP