1) wxHTML now outputs unrecognized entities verbosely

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

diff --git a/samples/docvwmdi/doc.h b/samples/docvwmdi/doc.h
index ce250ff74217a1fa3df0c791dcf673067bdab739..9440f374e0460fde2df2cfe3a14ba73a777c85c5 100644 (file)
--- a/samples/docvwmdi/doc.h
+++ b/samples/docvwmdi/doc.h
@@ -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


@@ -41,8 +42,8 @@ class DoodleSegment: public wxObject
   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 @@ class DrawingDocument: public wxDocument
   ~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);