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

8
samples/docview/doc.cpp
View File

@@ -44,7 +44,7 @@ DrawingDocument::~DrawingDocument(void)
}
#if wxUSE_STD_IOSTREAM
ostream& DrawingDocument::SaveObject(ostream& stream)
wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
{
wxDocument::SaveObject(stream);
@@ -88,7 +88,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
#endif
#if wxUSE_STD_IOSTREAM
istream& DrawingDocument::LoadObject(istream& stream)
wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
{
wxDocument::LoadObject(stream);
@@ -153,7 +153,7 @@ DoodleSegment::~DoodleSegment(void)
}
#if wxUSE_STD_IOSTREAM
ostream& DoodleSegment::SaveObject(ostream& stream)
wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{
wxInt32 n = lines.Number();
stream << n << '\n';
@@ -195,7 +195,7 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
#endif
#if wxUSE_STD_IOSTREAM
istream& DoodleSegment::LoadObject(istream& stream)
wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
{
wxInt32 n = 0;
stream >> n;

12
samples/docview/doc.h
View File

@@ -40,8 +40,8 @@ public:
void Draw(wxDC *dc);
#if wxUSE_STD_IOSTREAM
ostream& SaveObject(ostream& text_stream);
istream& LoadObject(istream& text_stream);
wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
wxSTD istream& LoadObject(wxSTD istream& text_stream);
#else
wxOutputStream& SaveObject(wxOutputStream& stream);
wxInputStream& LoadObject(wxInputStream& stream);
@@ -60,8 +60,8 @@ public:
~DrawingDocument(void);
#if wxUSE_STD_IOSTREAM
ostream& SaveObject(ostream& text_stream);
istream& LoadObject(istream& text_stream);
wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
wxSTD istream& LoadObject(wxSTD istream& text_stream);
#else
wxOutputStream& SaveObject(wxOutputStream& stream);
wxInputStream& LoadObject(wxInputStream& stream);
@@ -93,8 +93,8 @@ class TextEditDocument: public wxDocument
private:
public:
/*
ostream& SaveObject(ostream& stream);
istream& LoadObject(istream& stream);
wxSTD ostream& SaveObject(wxSTD ostream& stream);
wxSTD istream& LoadObject(wxSTD istream& stream);
*/
virtual bool OnSaveDocument(const wxString& filename);
virtual bool OnOpenDocument(const wxString& filename);

8
samples/docvwmdi/doc.cpp
View File

@@ -44,7 +44,7 @@ DrawingDocument::~DrawingDocument(void)
}
#if wxUSE_STD_IOSTREAM
ostream& DrawingDocument::SaveObject(ostream& stream)
wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
{
wxDocument::SaveObject(stream);
@@ -88,7 +88,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
#endif
#if wxUSE_STD_IOSTREAM
istream& DrawingDocument::LoadObject(istream& stream)
wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
{
wxDocument::LoadObject(stream);
@@ -152,7 +152,7 @@ DoodleSegment::~DoodleSegment(void)
}
#if wxUSE_STD_IOSTREAM
ostream& DoodleSegment::SaveObject(ostream& stream)
wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{
wxInt32 n = lines.Number();
stream << n << '\n';
@@ -194,7 +194,7 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
#endif
#if wxUSE_STD_IOSTREAM
istream& DoodleSegment::LoadObject(istream& stream)
wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
{
wxInt32 n = 0;
stream >> n;

12
samples/docvwmdi/doc.h
View File

@@ -41,8 +41,8 @@ class DoodleSegment: public wxObject
void Draw(wxDC *dc);
#if wxUSE_STD_IOSTREAM
ostream& SaveObject(ostream& text_stream);
istream& LoadObject(istream& text_stream);
wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
wxSTD istream& LoadObject(wxSTD istream& text_stream);
#else
wxOutputStream& SaveObject(wxOutputStream& stream);
wxInputStream& LoadObject(wxInputStream& stream);
@@ -60,8 +60,8 @@ class DrawingDocument: public wxDocument
~DrawingDocument(void);
#if wxUSE_STD_IOSTREAM
ostream& SaveObject(ostream& text_stream);
istream& LoadObject(istream& text_stream);
wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
wxSTD istream& LoadObject(wxSTD istream& text_stream);
#else
wxOutputStream& SaveObject(wxOutputStream& stream);
wxInputStream& LoadObject(wxInputStream& stream);
@@ -93,8 +93,8 @@ class TextEditDocument: public wxDocument
private:
public:
/*
ostream& SaveObject(ostream& stream);
istream& LoadObject(istream& stream);
wxSTD ostream& SaveObject(wxSTD ostream& stream);
wxSTD istream& LoadObject(wxSTD istream& stream);
*/
virtual bool OnSaveDocument(const wxString& filename);
virtual bool OnOpenDocument(const wxString& filename);

4
samples/typetest/typetest.cpp
View File

@@ -125,7 +125,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
textCtrl.WriteText( "Writing to ofstream and wxFileOutputStream:\n" );
ofstream std_file_output( "test_std.dat" );
wxSTD ofstream std_file_output( "test_std.dat" );
wxFileOutputStream file_output( wxString("test_wx.dat") );
wxBufferedOutputStream buf_output( file_output );
wxTextOutputStream text_output( buf_output );
@@ -163,7 +163,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
textCtrl.WriteText( "\nReading from ifstream:\n" );
ifstream std_file_input( "test_std.dat" );
wxSTD ifstream std_file_input( "test_std.dat" );
std_file_input >> si;
tmp.Printf( _T("Signed int: %d\n"), si );