treat NULL extension properly in wxLoad/SaveFileSelector; don't crash if NULL ext...

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 3ebf0d5b10c0a44fdb612353e262c1f31626bbe6..cba29271dcc07f07ba27d93cd3d37b19764afdd0 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -20,7 +20,7 @@ limitation)
 */
 
 #ifdef __GNUG__
 */
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "fs_inet.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -37,7 +37,6 @@ limitation)
 #if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
 #ifndef WXPRECOMP
 #if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"

 #endif
 
 #include "wx/wfstream.h"
 #endif
 
 #include "wx/wfstream.h"


@@ -74,7 +73,7 @@ static wxString StripProtocolAnchor(const wxString& location)
     else myloc = myloc.AfterFirst(wxT(':'));
 
     // fix malformed url:
     else myloc = myloc.AfterFirst(wxT(':'));
 
     // fix malformed url:

-    if (myloc.Left(2) != wxT("//")) 
+    if (myloc.Left(2) != wxT("//"))

     {
         if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc;
         else myloc = wxT("/") + myloc;
     {
         if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc;
         else myloc = wxT("/") + myloc;


@@ -89,7 +88,7 @@ static wxString StripProtocolAnchor(const wxString& location)
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);

-    if ((p == wxT("http")) || (p == wxT("ftp"))) 
+    if ((p == wxT("http")) || (p == wxT("ftp")))

     {
         wxURL url(p + wxT(":") + StripProtocolAnchor(location));
         return (url.GetError() == wxURL_NOERR);
     {
         wxURL url(p + wxT(":") + StripProtocolAnchor(location));
         return (url.GetError() == wxURL_NOERR);


@@ -112,7 +111,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
     if (info == NULL)
     {
         wxURL url(right);
     if (info == NULL)
     {
         wxURL url(right);

-        if (url.GetError() == wxURL_NOERR) 
+        if (url.GetError() == wxURL_NOERR)

         {
             s = url.GetInputStream();
             content = url.GetProtocol().GetContentType();
         {
             s = url.GetInputStream();
             content = url.GetProtocol().GetContentType();