X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/457814b5aa2ee5c83abc65a6aee2a3ebcb1af34f..69fb24ce03b4dd40e7912936d628bea1719aaaa3:/samples/docview/doc.h

diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index a83b45c877..43ad93c91a 100644
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -5,93 +5,102 @@
 // 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:
-  long x1;
-  long y1;
-  long x2;
-  long y2;
+public:
+    wxInt32 x1;
+    wxInt32 y1;
+    wxInt32 x2;
+    wxInt32 y2;
 };
 
 // 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);
+public:
+    wxList m_lines;
+
+    DoodleSegment() : wxObject() {}
+    DoodleSegment(const DoodleSegment& seg);
+    virtual ~DoodleSegment();
+
+    void Draw(wxDC *dc);
+#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
 
-  void Draw(wxDC *dc);
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
 };
 
-class DrawingDocument: public wxDocument
+class DrawingDocument : public wxDocument
 {
-  DECLARE_DYNAMIC_CLASS(DrawingDocument)
- private:
- public:
-  wxList doodleSegments;
-  
-  DrawingDocument(void);
-  ~DrawingDocument(void);
-
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
-
-  inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
+    DECLARE_DYNAMIC_CLASS(DrawingDocument)
+private:
+public:
+    wxList m_doodleSegments;
+
+    DrawingDocument() : wxDocument() {}
+    virtual ~DrawingDocument();
+
+#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() 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;
- public:
-  DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg);
-  ~DrawingCommand(void);
-
-  bool Do(void);
-  bool Undo(void);
+protected:
+    DoodleSegment*   m_segment;
+    DrawingDocument* m_doc;
+    int m_cmd;
+public:
+    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:
+    DECLARE_DYNAMIC_CLASS(TextEditDocument)
+public:
+    TextEditDocument() : wxDocument() {}
+    virtual ~TextEditDocument() {}
 /*
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
+    wxSTD ostream& SaveObject(wxSTD ostream&);
+    wxSTD istream& LoadObject(wxSTD istream&);
 */
-  virtual bool OnSaveDocument(const wxString& filename);
-  virtual bool OnOpenDocument(const wxString& filename);
-  virtual bool IsModified(void) const;
-  virtual void Modify(bool mod);
+    TextEditView* GetFirstView() const;
 
-  TextEditDocument(void) {}
-  ~TextEditDocument(void) {}
+    virtual bool OnSaveDocument(const wxString& filename);
+    virtual bool OnOpenDocument(const wxString& filename);
+    virtual bool IsModified(void) const;
+    virtual void Modify(bool mod);
 };