X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc25a89ac1e6c5208db24bfc0abc8666b791dc6..6ee3c06421446908fabe9de45b8e0c7519c28c24:/contrib/samples/ogl/ogledit/doc.h

diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h
index 09a841d494..17432e9c37 100644
--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/contrib/samples/ogl/ogledit/doc.h
@@ -12,19 +12,20 @@
 #ifndef _OGLSAMPLE_DOC_H_
 #define _OGLSAMPLE_DOC_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 // #pragma interface
 #endif
 
 #include <wx/docview.h>
+#include <wx/cmdproc.h>
 #include <wx/string.h>
-#include <wx/wxexpr.h>
 
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/wxexpr.h>
 #include <wx/ogl/ogl.h>
 
 #if wxUSE_STD_IOSTREAM
-class ostream;
-class istream;
+ #include <iosfwd>
 #endif
 
 /*
@@ -98,8 +99,8 @@ class DiagramDocument: public wxDocument
   ~DiagramDocument(void);
 
 #if wxUSE_STD_IOSTREAM
-    virtual ostream& SaveObject(ostream& stream);
-    virtual istream& LoadObject(istream& stream);
+    virtual wxSTD ostream& SaveObject(wxSTD ostream& stream);
+    virtual wxSTD istream& LoadObject(wxSTD istream& stream);
 #else
     virtual wxOutputStream& SaveObject(wxOutputStream& stream);
     virtual wxInputStream& LoadObject(wxInputStream& stream);