wait4() replaced by waitpid() which is POSIX

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index ae846c0c8fdac6793336c59e6a17bce2a063c2f2..01f8ebe21a7a33d2dbaa08e29ee1d2dc33a642cd 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -51,15 +51,12 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "wx/ioswrap.h"
+
 #if wxUSE_IOSTREAMH
-#include <iostream.h>
-#include <fstream.h>
+    #include <fstream.h>
 #else
-#include <iostream>
-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+    #include <fstream>
 #endif
 
 #if !USE_SHARED_LIBRARY
@@ -465,9 +462,10 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
  * Document view
  */
  
-wxView::wxView(wxDocument *doc)
+wxView::wxView()
 {
-  SetDocument(doc);
+//  SetDocument(doc);
+  m_viewDocument = (wxDocument*) NULL;
   
   m_viewTypeName = "";
   m_viewFrame = (wxFrame *) NULL;