Put back some code that was commented out for testing

[wxWidgets.git] / samples / docvwmdi / doc.h

diff --git a/samples/docvwmdi/doc.h b/samples/docvwmdi/doc.h
index a83b45c877114b88d964d5644673cb3390eb2a8d..ce250ff74217a1fa3df0c791dcf673067bdab739 100644 (file)
--- a/samples/docvwmdi/doc.h
+++ b/samples/docvwmdi/doc.h
@@ -22,10 +22,10 @@
 class DoodleLine: public wxObject
 {
  public:
-  long x1;
-  long y1;
-  long x2;
-  long y2;
+  wxInt32 x1;
+  wxInt32 y1;
+  wxInt32 x2;
+  wxInt32 y2;
 };
 
 // Contains a list of lines: represents a mouse-down doodle
@@ -39,8 +39,14 @@ class DoodleSegment: public wxObject
   ~DoodleSegment(void);
 
   void Draw(wxDC *dc);
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
+  
+#if wxUSE_STD_IOSTREAM
+  ostream& SaveObject(ostream& text_stream);
+  istream& LoadObject(istream& text_stream);
+#else
+  wxOutputStream& SaveObject(wxOutputStream& stream);
+  wxInputStream& LoadObject(wxInputStream& stream);
+#endif
 };
 
 class DrawingDocument: public wxDocument
@@ -53,8 +59,13 @@ class DrawingDocument: public wxDocument
   DrawingDocument(void);
   ~DrawingDocument(void);
 
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
+#if wxUSE_STD_IOSTREAM
+  ostream& SaveObject(ostream& text_stream);
+  istream& LoadObject(istream& text_stream);
+#else
+  wxOutputStream& SaveObject(wxOutputStream& stream);
+  wxInputStream& LoadObject(wxInputStream& stream);
+#endif
 
   inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
 };