X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..f559e6218d849dddd07d6c2adffa115e55b70576:/samples/docview/doc.h

diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index 06ec872828..af9b272fbe 100644
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -5,18 +5,15 @@
 // 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__
-// #pragma interface
-#endif
-
 #ifndef __DOCSAMPLEH__
 #define __DOCSAMPLEH__
 
 #include "wx/docview.h"
+#include "wx/cmdproc.h"
 
 // Plots a line from one point to the other
 class DoodleLine: public wxObject
@@ -33,20 +30,20 @@ class DoodleSegment: public wxObject
 {
 public:
     wxList lines;
-    
-    DoodleSegment(void);
-    DoodleSegment(DoodleSegment& seg);
+
+    DoodleSegment(void){};
+    DoodleSegment(const DoodleSegment& seg);
     ~DoodleSegment(void);
-    
+
     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
-    
+
 };
 
 class DrawingDocument: public wxDocument
@@ -55,18 +52,18 @@ class DrawingDocument: public wxDocument
 private:
 public:
     wxList doodleSegments;
-    
-    DrawingDocument(void);
+
+    DrawingDocument(void){};
     ~DrawingDocument(void);
-    
+
 #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
-    
+
     inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
 };
 
@@ -82,7 +79,7 @@ protected:
 public:
     DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg);
     ~DrawingCommand(void);
-    
+
     bool Do(void);
     bool Undo(void);
 };
@@ -93,14 +90,14 @@ 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);
     virtual bool IsModified(void) const;
     virtual void Modify(bool mod);
-    
+
     TextEditDocument(void) {}
     ~TextEditDocument(void) {}
 };