Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

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

diff --git a/samples/docvwmdi/doc.h b/samples/docvwmdi/doc.h
index a83b45c877114b88d964d5644673cb3390eb2a8d..4b01bc5a597f5b2c38a88aa0a146f803805f9484 100644 (file)
--- 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,15 +17,16 @@
 #define __DOCSAMPLEH__
 
 #include "wx/docview.h"
+#include "wx/cmdproc.h"
 
 // Plots a line from one point to the other
 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
@@ -34,13 +35,19 @@ class DoodleSegment: public wxObject
  public:
   wxList lines;
 
-  DoodleSegment(void);
+  DoodleSegment(void){};
   DoodleSegment(DoodleSegment& seg);
   ~DoodleSegment(void);
 
   void Draw(wxDC *dc);
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
+
+#if wxUSE_STD_IOSTREAM
+  wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
+  wxSTD istream& LoadObject(wxSTD istream& text_stream);
+#else
+  wxOutputStream& SaveObject(wxOutputStream& stream);
+  wxInputStream& LoadObject(wxInputStream& stream);
+#endif
 };
 
 class DrawingDocument: public wxDocument
@@ -49,12 +56,17 @@ class DrawingDocument: public wxDocument
  private:
  public:
   wxList doodleSegments;
-  
-  DrawingDocument(void);
+
+  DrawingDocument(void){};
   ~DrawingDocument(void);
 
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
+#if wxUSE_STD_IOSTREAM
+  wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
+  wxSTD istream& LoadObject(wxSTD istream& text_stream);
+#else
+  wxOutputStream& SaveObject(wxOutputStream& stream);
+  wxInputStream& LoadObject(wxInputStream& stream);
+#endif
 
   inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
 };
@@ -82,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);