X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/958d3a7e4bd56371cedcb3836aed397eae0b06d3..a9a56347b84be54a9d48df2cfe08ddf761aaf491:/samples/docview/doc.cpp diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp index eed9eee18d..87a24dad4e 100644 --- a/samples/docview/doc.cpp +++ b/samples/docview/doc.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -// #pragma implementation -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -23,11 +19,16 @@ #ifndef WX_PRECOMP #include "wx/wx.h" #endif -#include "wx/txtstrm.h" #ifdef __WXMAC__ #include "wx/filename.h" #endif +#if wxUSE_STD_IOSTREAM + #include "wx/ioswrap.h" +#else + #include "wx/txtstrm.h" +#endif + #if !wxUSE_DOC_VIEW_ARCHITECTURE #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! #endif @@ -123,7 +124,7 @@ wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream) } #endif -DoodleSegment::DoodleSegment(DoodleSegment& seg) +DoodleSegment::DoodleSegment(const DoodleSegment& seg):wxObject() { wxList::compatibility_iterator node = seg.lines.GetFirst(); while (node) @@ -171,7 +172,7 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream) wxTextOutputStream text_stream( stream ); wxInt32 n = lines.GetCount(); - text_stream << n << _T('\n'); + text_stream << n << _T("\n"); wxList::compatibility_iterator node = lines.GetFirst(); while (node)