X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..bfa7fb526812857201894c7fb4df6739cdd3cdfc:/samples/docview/doc.h diff --git a/samples/docview/doc.h b/samples/docview/doc.h index 06ec872828..c123e6a9ea 100644 --- a/samples/docview/doc.h +++ b/samples/docview/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 @@ -40,8 +41,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 +61,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 +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);