clarify role of wxToolBarToolBase (fixes #9874)

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

diff --git a/interface/wx/protocol/ftp.h b/interface/wx/protocol/ftp.h
index a99c957787081d467a0d881728e6e7ee08718848..b0f932fcd4645f4c0db487b8dba3158c17074f37 100644 (file)
--- a/interface/wx/protocol/ftp.h
+++ b/interface/wx/protocol/ftp.h
@@ -18,7 +18,6 @@ enum TransferMode
 
 /**
     @class wxFTP
 
 /**
     @class wxFTP

-    @headerfile ftp.h wx/protocol/ftp.h

 
     wxFTP can be used to establish a connection to an FTP server and perform all the
     usual operations. Please consult the RFC 959 for more details about the FTP
 
     wxFTP can be used to establish a connection to an FTP server and perform all the
     usual operations. Please consult the RFC 959 for more details about the FTP


@@ -98,13 +97,13 @@ public:
     /**
         Destructor will close the connection if connected.
     */
     /**
         Destructor will close the connection if connected.
     */

-    ~wxFTP();
+    virtual ~wxFTP();

 
     /**
         Aborts the download currently in process, returns @true if ok, @false
         if an error occurred.
     */
 
     /**
         Aborts the download currently in process, returns @true if ok, @false
         if an error occurred.
     */

-    bool Abort();
+    virtual bool Abort();

 
     /**
         Change the current FTP working directory.
 
     /**
         Change the current FTP working directory.


@@ -154,7 +153,7 @@ public:
         @see GetFilesList()
     */
     bool GetDirList(wxArrayString& files,
         @see GetFilesList()
     */
     bool GetDirList(wxArrayString& files,

-                    const wxString& wildcard = "");
+                    const wxString& wildcard = wxEmptyString);

 
     /**
         Returns the file size in bytes or -1 if the file doesn't exist or the size
 
     /**
         Returns the file size in bytes or -1 if the file doesn't exist or the size


@@ -178,7 +177,7 @@ public:
         @see GetDirList()
     */
     bool GetFilesList(wxArrayString& files,
         @see GetDirList()
     */
     bool GetFilesList(wxArrayString& files,

-                      const wxString& wildcard = "");
+                      const wxString& wildcard = wxEmptyString);

 
     /**
         Creates a new input stream on the specified path.
 
     /**
         Creates a new input stream on the specified path.


@@ -193,12 +192,12 @@ public:
         @return Returns @NULL if an error occurred (it could be a network failure
                  or the fact that the file doesn't exist).
     */
         @return Returns @NULL if an error occurred (it could be a network failure
                  or the fact that the file doesn't exist).
     */

-    wxInputStream* GetInputStream(const wxString& path);
+    virtual wxInputStream* GetInputStream(const wxString& path);

 
     /**
         Returns the last command result, i.e. the full server reply for the last command.
     */
 
     /**
         Returns the last command result, i.e. the full server reply for the last command.
     */

-    const wxString GetLastResult();
+    const wxString& GetLastResult();

 
     /**
         Initializes an output stream to the specified @e file.
 
     /**
         Initializes an output stream to the specified @e file.


@@ -210,7 +209,7 @@ public:
 
         @see wxOutputStream
     */
 
         @see wxOutputStream
     */

-    wxOutputStream* GetOutputStream(const wxString& file);
+    virtual wxOutputStream* GetOutputStream(const wxString& file);

 
     /**
         Create the specified directory in the current FTP working directory.
 
     /**
         Create the specified directory in the current FTP working directory.


@@ -267,7 +266,7 @@ public:
     /**
         Sets the password to be sent to the FTP server to be allowed to log in.
     */
     /**
         Sets the password to be sent to the FTP server to be allowed to log in.
     */

-    void SetPassword(const wxString& passwd);
+    virtual void SetPassword(const wxString& passwd);

 
     /**
         Sets the transfer mode to the specified one. It will be used for the next
 
     /**
         Sets the transfer mode to the specified one. It will be used for the next


@@ -280,6 +279,6 @@ public:
     /**
         Sets the user name to be sent to the FTP server to be allowed to log in.
     */
     /**
         Sets the user name to be sent to the FTP server to be allowed to log in.
     */

-    void SetUser(const wxString& user);
+    virtual void SetUser(const wxString& user);

 };
 
 };