move m_sizeSet out of wxWindow

[wxWidgets.git] / samples / docview / doc.cpp

diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index f4b5f587c4ad817bd046df8341f44f6430b76f71..87a24dad4e9e6988ff5844f4f7d89c23ce97e169 100644 (file)
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -19,11 +19,16 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif

-#include "wx/txtstrm.h"

 #ifdef __WXMAC__
 #include "wx/filename.h"
 #endif
 
 #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
 #if !wxUSE_DOC_VIEW_ARCHITECTURE
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
 #endif


@@ -119,7 +124,7 @@ wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
 }
 #endif
 
 }
 #endif
 

-DoodleSegment::DoodleSegment(DoodleSegment& seg):wxObject()
+DoodleSegment::DoodleSegment(const DoodleSegment& seg):wxObject()

 {
     wxList::compatibility_iterator node = seg.lines.GetFirst();
     while (node)
 {
     wxList::compatibility_iterator node = seg.lines.GetFirst();
     while (node)


@@ -167,7 +172,7 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
     wxTextOutputStream text_stream( stream );
 
     wxInt32 n = lines.GetCount();
     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)
 
     wxList::compatibility_iterator node = lines.GetFirst();
     while (node)