Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/interface/wx/protocol/ftp.h b/interface/wx/protocol/ftp.h
index b03ce1a163247f578d2824d071a1515621f1911d..b6a7992ffcb37a9930f9cb2a7c1339dbe5751010 100644 (file)
--- a/interface/wx/protocol/ftp.h
+++ b/interface/wx/protocol/ftp.h
@@ -3,19 +3,9 @@
 // Purpose:     interface of wxFTP
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxFTP
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-/**
-    Transfer modes used by wxFTP.
-*/
-enum TransferMode
-{
-    NONE,       //!< not set by user explicitly.
-    ASCII,
-    BINARY
-};
-

 /**
     @class wxFTP
 
 /**
     @class wxFTP
 


@@ -54,7 +44,7 @@ enum TransferMode
             wxLogError("Couldn't get the file size for \"%s\"", filename);
         }
 
             wxLogError("Couldn't get the file size for \"%s\"", filename);
         }
 

-        wxInputStream *i = ftp.GetInputStream(filename);
+        wxInputStream *in = ftp.GetInputStream(filename);

         if ( !in )
         {
             wxLogError("Couldn't get the file");
         if ( !in )
         {
             wxLogError("Couldn't get the file");


@@ -100,6 +90,16 @@ enum TransferMode
 class wxFTP : public wxProtocol
 {
 public:
 class wxFTP : public wxProtocol
 {
 public:

+    /**
+        Transfer modes used by wxFTP.
+    */
+    enum TransferMode
+    {
+        NONE,       //!< not set by user explicitly.
+        ASCII,
+        BINARY
+    };
+

     /**
         Default constructor.
     */
     /**
         Default constructor.
     */