continue with loading the message catalog even if setting the locale failed

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

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index f79c40f1bc9e9671980105986530ec79b4124976..01336376e0e4233cb32d60d1d9ed417115bd5447 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -47,7 +47,7 @@ public:
     // Parameters set up
 
     // set transfer mode now
     // Parameters set up
 
     // set transfer mode now

-    void SetPassive(bool pasv) { m_bPassive = pasv; };
+    void SetPassive(bool pasv) { m_bPassive = pasv; }

     void SetDefaultTimeout(wxUint32 Value);
     bool SetBinary() { return SetTransferMode(BINARY); }
     bool SetAscii() { return SetTransferMode(ASCII); }
     void SetDefaultTimeout(wxUint32 Value);
     bool SetBinary() { return SetTransferMode(BINARY); }
     bool SetAscii() { return SetTransferMode(ASCII); }


@@ -138,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