Tcl regex lib

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

diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index 06ec8728287404682169cf5a9cc5ad2e9429aa88..fde6be752aba3c22d710be59edc81d3282f240a8 100644 (file)
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,6 +17,7 @@
 #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


@@ -40,8 +41,8 @@ public:
     
     void Draw(wxDC *dc);
 #if wxUSE_STD_IOSTREAM
     
     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);
 #else
     wxOutputStream& SaveObject(wxOutputStream& stream);
     wxInputStream& LoadObject(wxInputStream& stream);


@@ -60,8 +61,8 @@ public:
     ~DrawingDocument(void);
     
 #if wxUSE_STD_IOSTREAM
     ~DrawingDocument(void);
     
 #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);
 #else
     wxOutputStream& SaveObject(wxOutputStream& stream);
     wxInputStream& LoadObject(wxInputStream& stream);


@@ -93,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);