Applied patch to add n bitmaps at once to an image

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

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index 3f351f3664ed3e6e5e0346927500a1a42634151b..03a1a6ba6903074ba7ac96909cdb836cfc081e6b 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -13,10 +13,6 @@
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "ftp.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_PROTOCOL_FTP
 #include "wx/defs.h"
 
 #if wxUSE_PROTOCOL_FTP


@@ -129,7 +125,7 @@ protected:
                          const wxString& arg = wxEmptyString);
 
     // get the server reply, return the first character of the reply code,
                          const wxString& arg = wxEmptyString);
 
     // get the server reply, return the first character of the reply code,

-    // '1'..'5' for normal FTP replies, 0 (*not* '0') if an error occured
+    // '1'..'5' for normal FTP replies, 0 (*not* '0') if an error occurred

     char GetResult();
 
     // check that the result is equal to expected value
     char GetResult();
 
     // check that the result is equal to expected value


@@ -142,7 +138,7 @@ protected:
     wxSocketBase *GetActivePort();
 
     // helper for GetPort()
     wxSocketBase *GetActivePort();
 
     // helper for GetPort()

-    wxString GetPortCmdArgument(wxIPV4address Local, wxIPV4address New);
+    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
 
     // accept connection from server in active mode, returns the same socket as
     // passed in in passive mode