Removed 'interface' pragma for gcc 2.96

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 05bf75c3486c06ef5217b36229fe837e56356c52..3ebf0d5b10c0a44fdb612353e262c1f31626bbe6 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -34,7 +34,7 @@ limitation)
     #define wxUSE_FS_INET 0
 #endif
 
-#if wxUSE_FS_INET
+#if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
@@ -94,8 +94,8 @@ bool wxInternetFSHandler::CanOpen(const wxString& location)
         wxURL url(p + wxT(":") + StripProtocolAnchor(location));
         return (url.GetError() == wxURL_NOERR);
     }
-    else 
-        return FALSE;
+
+    return FALSE;
 }
 
 
@@ -140,15 +140,14 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
 
     // Load item from cache:
     s = new wxFileInputStream(info->GetTemp());
-    if (s)
-    {
-        return new wxFSFile(s,
-                            right,
-                            info->GetMime(),
-                            GetAnchor(location),
-                            wxDateTime::Today());
-    }
-    else return (wxFSFile*) NULL;
+    if (!s)
+        return (wxFSFile*) NULL;
+
+    return new wxFSFile(s,
+                        right,
+                        info->GetMime(),
+                        GetAnchor(location),
+                        wxDateTime::Now());
 }
 
 
@@ -182,4 +181,4 @@ class wxFileSystemInternetModule : public wxModule
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 
-#endif // wxUSE_FS_INET
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_INET