1. added wxGetNumberFromUser (to textdlgg.cpp and dialogs sample)

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index acb0c25831df3f6d7ba032c6c0819c4a36e1b270..37453002084b5aa4095c7c6e12af5c6fe1ed7b23 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -8,7 +8,7 @@
 
 /*
 
 
 /*
 

-REMARKS : 
+REMARKS :

 
 This FS creates local cache (in /tmp directory). The cache is freed
 on program exit.
 
 This FS creates local cache (in /tmp directory). The cache is freed
 on program exit.


@@ -29,6 +29,8 @@ limitation)
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_FS_INET
+

 #ifndef WXPRECOMP
 #include <wx/wx.h>
 #endif
 #ifndef WXPRECOMP
 #include <wx/wx.h>
 #endif


@@ -62,15 +64,13 @@ class wxInetCacheNode : public wxObject
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);

-    return (p == "http") || (p == "ftp");
+    return (p == _T("http")) || (p == _T("ftp"));

 }
 
 
 }
 
 

-
-

 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {

-    wxString right = GetProtocol(location) + ":" + GetRightLocation(location);
+    wxString right = GetProtocol(location) + _T(":") + GetRightLocation(location);

     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;
     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;


@@ -78,15 +78,17 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
     info = (wxInetCacheNode*) m_Cache.Get(right);
 
     // Add item into cache:
     info = (wxInetCacheNode*) m_Cache.Get(right);
 
     // Add item into cache:

-    if (info == NULL) {
+    if (info != NULL)
+    {

         wxURL url(right);
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
         wxURL url(right);
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);

-        if (s) {
+        if (s) 
+       {

             char buf[256];
 
             char buf[256];
 

-            wxGetTempFileName("wxhtml", buf);
+            wxGetTempFileName( "wxhtml", buf);

             info = new wxInetCacheNode(buf, content);
             m_Cache.Put(right, info);
 
             info = new wxInetCacheNode(buf, content);
             m_Cache.Put(right, info);
 


@@ -96,18 +98,22 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
             }
             delete s;
         }
             }
             delete s;
         }

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

     }
 
     // Load item from cache:
     }
 
     // Load item from cache:

-    s = new wxFileInputStream(info -> GetTemp());
-    if (s) {
+    s = new wxFileInputStream(info->GetTemp());
+    if (s) 
+    {

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

-                            info -> GetMime(),
+                            info->GetMime(),

                             GetAnchor(location));
     }
                             GetAnchor(location));
     }

-    else return NULL;
+    else return (wxFSFile*) NULL;

 }
 
 
 }
 
 


@@ -118,13 +124,12 @@ wxInternetFSHandler::~wxInternetFSHandler()
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();

-    while ((n = m_Cache.Next()) != NULL) {
-        n2 = (wxInetCacheNode*) n -> GetData();
-        wxRemoveFile(n2 -> GetTemp());
+    while ((n = m_Cache.Next()) != NULL) 
+    {
+        n2 = (wxInetCacheNode*) n->GetData();
+        wxRemoveFile(n2->GetTemp());

         delete n2;
     }
 }
 
         delete n2;
     }
 }
 

-
-
-
+#endif // wxUSE_FS_INET