wxMGL bugfixes

[wxWidgets.git] / contrib / samples / ogl / ogledit / doc.cpp

diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp
index 3557696662e84dade897865b5527e0c4c11448f7..25dae364c80af3d5e1e04f25c31ac16e05b7f829 100644 (file)
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/contrib/samples/ogl/ogledit/doc.cpp
@@ -34,7 +34,7 @@
 #include "view.h"
 
 #if wxUSE_STD_IOSTREAM
 #include "view.h"
 
 #if wxUSE_STD_IOSTREAM

-#include <iostream.h>
+#include <ioswrap.h>

 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(DiagramDocument, wxDocument)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(DiagramDocument, wxDocument)


@@ -54,7 +54,7 @@ bool DiagramDocument::OnCloseDocument(void)
 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM

-ostream& DiagramDocument::SaveObject(ostream& stream)
+wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)

 {
   wxDocument::SaveObject(stream);
   
 {
   wxDocument::SaveObject(stream);
   


@@ -69,7 +69,7 @@ ostream& DiagramDocument::SaveObject(ostream& stream)
   return stream;
 }
 
   return stream;
 }
 

-istream& DiagramDocument::LoadObject(istream& stream)
+wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)

 {
   wxDocument::LoadObject(stream);
 
 {
   wxDocument::LoadObject(stream);