Unicode compilation fix

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

diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index 06ec8728287404682169cf5a9cc5ad2e9429aa88..fa372463b3221fc9f248b9278dfd4287d746c30c 100644 (file)
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,6 +17,7 @@
 #define __DOCSAMPLEH__
 
 #include "wx/docview.h"
 #define __DOCSAMPLEH__
 
 #include "wx/docview.h"

+#include "wx/cmdproc.h"

 
 // Plots a line from one point to the other
 class DoodleLine: public wxObject
 
 // Plots a line from one point to the other
 class DoodleLine: public wxObject


@@ -33,20 +34,20 @@ class DoodleSegment: public wxObject
 {
 public:
     wxList lines;
 {
 public:
     wxList lines;

-    
-    DoodleSegment(void);
+
+    DoodleSegment(void){};

     DoodleSegment(DoodleSegment& seg);
     ~DoodleSegment(void);
     DoodleSegment(DoodleSegment& seg);
     ~DoodleSegment(void);

-    
+

     void Draw(wxDC *dc);
 #if wxUSE_STD_IOSTREAM
     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);
 #endif
 #else
     wxOutputStream& SaveObject(wxOutputStream& stream);
     wxInputStream& LoadObject(wxInputStream& stream);
 #endif

-    
+

 };
 
 class DrawingDocument: public wxDocument
 };
 
 class DrawingDocument: public wxDocument


@@ -55,18 +56,18 @@ class DrawingDocument: public wxDocument
 private:
 public:
     wxList doodleSegments;
 private:
 public:
     wxList doodleSegments;

-    
-    DrawingDocument(void);
+
+    DrawingDocument(void){};

     ~DrawingDocument(void);
     ~DrawingDocument(void);

-    
+

 #if wxUSE_STD_IOSTREAM
 #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);
 #endif
 #else
     wxOutputStream& SaveObject(wxOutputStream& stream);
     wxInputStream& LoadObject(wxInputStream& stream);
 #endif

-    
+

     inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
 };
 
     inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
 };
 


@@ -82,7 +83,7 @@ protected:
 public:
     DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg);
     ~DrawingCommand(void);
 public:
     DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg);
     ~DrawingCommand(void);

-    
+

     bool Do(void);
     bool Undo(void);
 };
     bool Do(void);
     bool Undo(void);
 };


@@ -93,14 +94,14 @@ class TextEditDocument: public wxDocument
 private:
 public:
 /*
 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);
     virtual bool IsModified(void) const;
     virtual void Modify(bool mod);
     */
     virtual bool OnSaveDocument(const wxString& filename);
     virtual bool OnOpenDocument(const wxString& filename);
     virtual bool IsModified(void) const;
     virtual void Modify(bool mod);

-    
+

     TextEditDocument(void) {}
     ~TextEditDocument(void) {}
 };
     TextEditDocument(void) {}
     ~TextEditDocument(void) {}
 };