some != NULL checks

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index bcd9d3de2fa0b8d7a393d43bc43044129ccbf1f2..1f8003aff7ff218e988cb7be9e79bb1b78fdfa90 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1342,9 +1342,6 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
         m_lastDirectory = wxPathOnly(pathTmp);
 
         path = pathTmp;
         m_lastDirectory = wxPathOnly(pathTmp);
 
         path = pathTmp;

-        wxString theExt = FindExtension(path);
-        if (!theExt)
-            return (wxDocTemplate *) NULL;

 
         // This is dodgy in that we're selecting the template on the
         // basis of the file extension, which may not be a standard
 
         // This is dodgy in that we're selecting the template on the
         // basis of the file extension, which may not be a standard


@@ -2194,6 +2191,42 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename)
     fclose (fd1);
     return TRUE;
 }
     fclose (fd1);
     return TRUE;
 }

+#else
+bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
+{
+    FILE *fd1;
+    int ch;
+
+    if ((fd1 = fopen (filename.fn_str(), "rb")) == NULL)
+        return FALSE;
+
+    while ((ch = getc (fd1)) != EOF)
+        stream.PutC((char) ch);
+
+    fclose (fd1);
+    return TRUE;
+}
+
+bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
+{
+    FILE *fd1;
+    char ch;
+
+    if ((fd1 = fopen (filename.fn_str(), "wb")) == NULL)
+    {
+        return FALSE;
+    }
+
+    int len = stream.StreamSize();
+    // TODO: is this the correct test for EOF?
+    while (stream.TellI() < (len - 1))
+    {
+        ch = stream.GetC();
+        putc (ch, fd1);
+    }
+    fclose (fd1);
+    return TRUE;
+}

 #endif
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 #endif
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE