Made wxNO_DEFAULT set the "no" button as the default, according to the docs

[wxWidgets.git] / src / common / fs_inet.cpp

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 457f9a51fd2980172402070d175820a9894ef599..dfbc0089657337d7f23ac70f3926b4ef17e1525c 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -89,7 +89,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);

-        if (s) 
+        if (s)

        {
             wxChar buf[256];
 
        {
             wxChar buf[256];
 


@@ -98,20 +98,25 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
             m_Cache.Put(right, info);
 
             {   // ok, now copy it:
             m_Cache.Put(right, info);
 
             {   // ok, now copy it:

+#if defined(__VISAGECPP__)
+// VA thinks this is an ambiguous call
+                wxFileOutputStream sout((wxString)buf);
+#else

                 wxFileOutputStream sout(buf);
                 wxFileOutputStream sout(buf);

+#endif

                 s -> Read(sout); // copy the stream
             }
             delete s;
         }
         else
                 s -> Read(sout); // copy the stream
             }
             delete s;
         }
         else

-       { 
-           return (wxFSFile*) NULL; // we can't open the URL
-       }
+        {
+            return (wxFSFile*) NULL; // we can't open the URL
+        }

     }
 
     // Load item from cache:
     s = new wxFileInputStream(info->GetTemp());
     }
 
     // Load item from cache:
     s = new wxFileInputStream(info->GetTemp());

-    if (s) 
+    if (s)

     {
         return new wxFSFile(s,
                             right,
     {
         return new wxFSFile(s,
                             right,


@@ -129,7 +134,7 @@ wxInternetFSHandler::~wxInternetFSHandler()
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();

-    while ((n = m_Cache.Next()) != NULL) 
+    while ((n = m_Cache.Next()) != NULL)

     {
         n2 = (wxInetCacheNode*) n->GetData();
         wxRemoveFile(n2->GetTemp());
     {
         n2 = (wxInetCacheNode*) n->GetData();
         wxRemoveFile(n2->GetTemp());