a warning in the release build suppressed

[wxWidgets.git] / include / wx / stream.h

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 692d522305a6b3b30a8489b52418abce253431ef..c56b8c6171763966f0d444c18d1f4c048af15cc6 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -17,24 +17,15 @@
 #endif
 
 #include <stdio.h>
-#include <wx/object.h>
-#include <wx/string.h>
-
-#ifdef    _MSC_VER
-  #define   off_t       _off_t
-#endif
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/filefn.h"  // for off_t and wxSeekMode
 
 /*
  * wxStream: base classes
  */
-
-typedef enum {
-  wxFromStart, wxFromCurrent, wxFromEnd
-} wxSeekMode;
-
 class wxOutputStream;
-class wxInputStream: virtual public wxObject {
-  DECLARE_ABSTRACT_CLASS(wxInputStream)
+class wxInputStream {
  public:
   wxInputStream();
   virtual ~wxInputStream();
@@ -51,8 +42,7 @@ class wxInputStream: virtual public wxObject {
   wxInputStream& operator>>(wxOutputStream& out) { return Read(out); }
 };
 
-class wxOutputStream: virtual public wxObject {
-  DECLARE_ABSTRACT_CLASS(wxOutputStream)
+class wxOutputStream {
  public:
   wxOutputStream();
   virtual ~wxOutputStream();
@@ -74,7 +64,6 @@ class wxOutputStream: virtual public wxObject {
  */
 
 class wxFilterInputStream: public wxInputStream {
-  DECLARE_CLASS(wxFilterInputStream)
  public:
   wxFilterInputStream(wxInputStream& stream);
   virtual ~wxFilterInputStream();
@@ -94,7 +83,6 @@ class wxFilterInputStream: public wxInputStream {
 };
 
 class wxFilterOutputStream: public wxOutputStream {
-  DECLARE_CLASS(wxFilterOutputStream)
  public:
   wxFilterOutputStream(wxOutputStream& stream);
   virtual ~wxFilterOutputStream();