X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23a54e14a71e9184c3c33c2ba39b10ee1dd029b6..6d06e061dc11140151be2914c30c759ee15e3fe7:/samples/docvwmdi/doc.h diff --git a/samples/docvwmdi/doc.h b/samples/docvwmdi/doc.h index ce250ff742..b002a81f5b 100644 --- a/samples/docvwmdi/doc.h +++ b/samples/docvwmdi/doc.h @@ -5,8 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -17,6 +17,7 @@ #define __DOCSAMPLEH__ #include "wx/docview.h" +#include "wx/cmdproc.h" // Plots a line from one point to the other class DoodleLine: public wxObject @@ -41,8 +42,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 +61,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 +94,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);