X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..94d0d21a15fa73ac426480d195d16ee04caf2de8:/samples/docview/doc.h?ds=sidebyside

diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index 06ec872828..43ad93c91a 100644
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -5,21 +5,18 @@
 // 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__
+#ifndef __DOC_H__
+#define __DOC_H__
 
 #include "wx/docview.h"
+#include "wx/cmdproc.h"
 
 // Plots a line from one point to the other
-class DoodleLine: public wxObject
+class DoodleLine : public wxObject
 {
 public:
     wxInt32 x1;
@@ -29,80 +26,81 @@ public:
 };
 
 // Contains a list of lines: represents a mouse-down doodle
-class DoodleSegment: public wxObject
+class DoodleSegment : public wxObject
 {
 public:
-    wxList lines;
-    
-    DoodleSegment(void);
-    DoodleSegment(DoodleSegment& seg);
-    ~DoodleSegment(void);
-    
+    wxList m_lines;
+
+    DoodleSegment() : wxObject() {}
+    DoodleSegment(const DoodleSegment& seg);
+    virtual ~DoodleSegment();
+
     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
+class DrawingDocument : public wxDocument
 {
     DECLARE_DYNAMIC_CLASS(DrawingDocument)
 private:
 public:
-    wxList doodleSegments;
-    
-    DrawingDocument(void);
-    ~DrawingDocument(void);
-    
+    wxList m_doodleSegments;
+
+    DrawingDocument() : wxDocument() {}
+    virtual ~DrawingDocument();
+
 #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; };
+
+    inline wxList& GetDoodleSegments() const { return (wxList&) m_doodleSegments; };
 };
 
 #define DOODLE_CUT          1
 #define DOODLE_ADD          2
 
-class DrawingCommand: public wxCommand
+class DrawingCommand : public wxCommand
 {
 protected:
-    DoodleSegment *segment;
-    DrawingDocument *doc;
-    int cmd;
+    DoodleSegment*   m_segment;
+    DrawingDocument* m_doc;
+    int m_cmd;
 public:
-    DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg);
-    ~DrawingCommand(void);
-    
+    DrawingCommand(const wxString& name, int cmd, DrawingDocument*, DoodleSegment*);
+    virtual ~DrawingCommand();
+
     bool Do(void);
     bool Undo(void);
 };
 
-class TextEditDocument: public wxDocument
+class TextEditView;
+class TextEditDocument : public wxDocument
 {
     DECLARE_DYNAMIC_CLASS(TextEditDocument)
-private:
 public:
+    TextEditDocument() : wxDocument() {}
+    virtual ~TextEditDocument() {}
 /*
-ostream& SaveObject(ostream& stream);
-istream& LoadObject(istream& stream);
-    */
+    wxSTD ostream& SaveObject(wxSTD ostream&);
+    wxSTD istream& LoadObject(wxSTD istream&);
+*/
+    TextEditView* GetFirstView() const;
+
     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) {}
 };