Fix compilo

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

diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index fde6be752aba3c22d710be59edc81d3282f240a8..43ad93c91a79c8343acfb1aefb963e2c6932a87a 100644 (file)
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -5,22 +5,18 @@
 // 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
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 #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;
 {
 public:
     wxInt32 x1;


@@ -30,15 +26,15 @@ public:
 };
 
 // Contains a list of lines: represents a mouse-down doodle
 };
 
 // Contains a list of lines: represents a mouse-down doodle

-class DoodleSegment: public wxObject
+class DoodleSegment : public wxObject

 {
 public:
 {
 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
     wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
     void Draw(wxDC *dc);
 #if wxUSE_STD_IOSTREAM
     wxSTD ostream& SaveObject(wxSTD ostream& text_stream);


@@ -47,19 +43,19 @@ public:
     wxOutputStream& SaveObject(wxOutputStream& stream);
     wxInputStream& LoadObject(wxInputStream& stream);
 #endif
     wxOutputStream& SaveObject(wxOutputStream& stream);
     wxInputStream& LoadObject(wxInputStream& stream);
 #endif

-    
+

 };
 
 };
 

-class DrawingDocument: public wxDocument
+class DrawingDocument : public wxDocument

 {
     DECLARE_DYNAMIC_CLASS(DrawingDocument)
 private:
 public:
 {
     DECLARE_DYNAMIC_CLASS(DrawingDocument)
 private:
 public:

-    wxList doodleSegments;
-    
-    DrawingDocument(void);
-    ~DrawingDocument(void);
-    
+    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);
 #if wxUSE_STD_IOSTREAM
     wxSTD ostream& SaveObject(wxSTD ostream& text_stream);
     wxSTD istream& LoadObject(wxSTD istream& text_stream);


@@ -67,43 +63,44 @@ public:
     wxOutputStream& SaveObject(wxOutputStream& stream);
     wxInputStream& LoadObject(wxInputStream& stream);
 #endif
     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
 
 };
 
 #define DOODLE_CUT          1
 #define DOODLE_ADD          2
 

-class DrawingCommand: public wxCommand
+class DrawingCommand : public wxCommand

 {
 protected:
 {
 protected:

-    DoodleSegment *segment;
-    DrawingDocument *doc;
-    int cmd;
+    DoodleSegment*   m_segment;
+    DrawingDocument* m_doc;
+    int m_cmd;

 public:
 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);
 };
 
     bool Do(void);
     bool Undo(void);
 };
 

-class TextEditDocument: public wxDocument
+class TextEditView;
+class TextEditDocument : public wxDocument

 {
     DECLARE_DYNAMIC_CLASS(TextEditDocument)
 {
     DECLARE_DYNAMIC_CLASS(TextEditDocument)

-private:

 public:
 public:

+    TextEditDocument() : wxDocument() {}
+    virtual ~TextEditDocument() {}

 /*
 /*

-wxSTD ostream& SaveObject(wxSTD ostream& stream);
-wxSTD istream& LoadObject(wxSTD 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);
     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) {}

 };
 
 
 };