Compile fix.

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

diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index a83b45c877114b88d964d5644673cb3390eb2a8d..a843fc2f780d706db87d81230f09894e74f98336 100644 (file)
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -17,46 +17,58 @@
 #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
 {

- 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
 {
 };
 
 // Contains a list of lines: represents a mouse-down doodle
 class DoodleSegment: public wxObject
 {

- public:
-  wxList lines;
-
-  DoodleSegment(void);
-  DoodleSegment(DoodleSegment& seg);
-  ~DoodleSegment(void);
-
-  void Draw(wxDC *dc);
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
+public:
+    wxList lines;
+    
+    DoodleSegment(void);
+    DoodleSegment(DoodleSegment& seg);
+    ~DoodleSegment(void);
+    
+    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
+    

 };
 
 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 doodleSegments;
+    
+    DrawingDocument(void);
+    ~DrawingDocument(void);
+    
+#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(void) const { return (wxList&) doodleSegments; };

 };
 
 #define DOODLE_CUT          1
 };
 
 #define DOODLE_CUT          1


@@ -64,34 +76,34 @@ class DrawingDocument: public wxDocument
 
 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 *segment;
+    DrawingDocument *doc;
+    int cmd;
+public:
+    DrawingCommand(const wxString& name, int cmd, DrawingDocument *ddoc, DoodleSegment *seg);
+    ~DrawingCommand(void);
+    
+    bool Do(void);
+    bool Undo(void);

 };
 
 class TextEditDocument: public wxDocument
 {
 };
 
 class TextEditDocument: public wxDocument
 {

-  DECLARE_DYNAMIC_CLASS(TextEditDocument)
- private:
- public:
+    DECLARE_DYNAMIC_CLASS(TextEditDocument)
+private:
+public:

 /*
 /*

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

 };
 
 
 };