Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch for compilation with gcc 3.0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-06 16:51:53 +00:00
parent 014e19de74
commit dd107c50be
30 changed files with 146 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/samples/ogl/ogledit/doc.cpp
View File

@@ -34,7 +34,7 @@
#include "view.h"
#if wxUSE_STD_IOSTREAM
#include <iostream.h>
#include <ioswrap.h>
#endif
IMPLEMENT_DYNAMIC_CLASS(DiagramDocument, wxDocument)
@@ -54,7 +54,7 @@ bool DiagramDocument::OnCloseDocument(void)
}
#if wxUSE_STD_IOSTREAM
ostream& DiagramDocument::SaveObject(ostream& stream)
wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
{
wxDocument::SaveObject(stream);
@@ -69,7 +69,7 @@ ostream& DiagramDocument::SaveObject(ostream& stream)
return stream;
}
istream& DiagramDocument::LoadObject(istream& stream)
wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)
{
wxDocument::LoadObject(stream);

7
contrib/samples/ogl/ogledit/doc.h
View File

@@ -23,8 +23,7 @@
#include <wx/ogl/ogl.h>
#if wxUSE_STD_IOSTREAM
class ostream;
class istream;
#include <iosfwd>
#endif
/*
@@ -98,8 +97,8 @@ class DiagramDocument: public wxDocument
~DiagramDocument(void);
#if wxUSE_STD_IOSTREAM
virtual ostream& SaveObject(ostream& stream);
virtual istream& LoadObject(istream& stream);
virtual wxSTD ostream& SaveObject(wxSTD ostream& stream);
virtual wxSTD istream& LoadObject(wxSTD istream& stream);
#else
virtual wxOutputStream& SaveObject(wxOutputStream& stream);
virtual wxInputStream& LoadObject(wxInputStream& stream);