oops, forgot to fix wxHtmlTag dtor

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

diff --git a/samples/docvwmdi/doc.h b/samples/docvwmdi/doc.h
index a83b45c877114b88d964d5644673cb3390eb2a8d..9440f374e0460fde2df2cfe3a14ba73a777c85c5 100644 (file)
--- a/samples/docvwmdi/doc.h
+++ b/samples/docvwmdi/doc.h
@@ -17,15 +17,16 @@
 #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
 {
  public:
 
 // Plots a line from one point to the other
 class DoodleLine: public wxObject
 {
  public:

-  long x1;
-  long y1;
-  long x2;
-  long y2;
+  wxInt32 x1;
+  wxInt32 y1;
+  wxInt32 x2;
+  wxInt32 y2;

 };
 
 // Contains a list of lines: represents a mouse-down doodle
 };
 
 // Contains a list of lines: represents a mouse-down doodle


@@ -39,8 +40,14 @@ class DoodleSegment: public wxObject
   ~DoodleSegment(void);
 
   void Draw(wxDC *dc);
   ~DoodleSegment(void);
 
   void Draw(wxDC *dc);

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


@@ -53,8 +60,13 @@ class DrawingDocument: public wxDocument
   DrawingDocument(void);
   ~DrawingDocument(void);
 
   DrawingDocument(void);
   ~DrawingDocument(void);
 

-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
+#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; };
 };
 
   inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
 };


@@ -82,8 +94,8 @@ class TextEditDocument: public wxDocument
  private:
  public:
 /*
  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 OnSaveDocument(const wxString& filename);
   virtual bool OnOpenDocument(const wxString& filename);