More wxMotif work, OGL enhancements, USE_ macro corrections, object.cpp delete

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 8d5b759dcdd150a136c252f0162a92cada8bee31..66320d1a64e8456a29a27361fa6fcbce4d528845 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DATSTREAMH__
-#define __DATSTREAMH__
+#ifndef _WX_DATSTREAM_H_
+#define _WX_DATSTREAM_H_

 
 #ifdef __GNUG__
 #pragma interface "datstrm.h"
 
 #ifdef __GNUG__
 #pragma interface "datstrm.h"


@@ -18,7 +18,7 @@
 
 #include <wx/stream.h>
 
 
 #include <wx/stream.h>
 

-class wxDataInputStream: public wxFilterInputStream {
+class wxDataInputStream: public virtual wxFilterInputStream {

 public:
   wxDataInputStream(wxInputStream& s);
   virtual ~wxDataInputStream();
 public:
   wxDataInputStream(wxInputStream& s);
   virtual ~wxDataInputStream();


@@ -31,7 +31,7 @@ public:
   wxString ReadString();
 };
 
   wxString ReadString();
 };
 

-class wxDataOutputStream: public wxFilterOutputStream {
+class wxDataOutputStream: public virtual wxFilterOutputStream {

  public:
   wxDataOutputStream(wxOutputStream& s);
   virtual ~wxDataOutputStream();
  public:
   wxDataOutputStream(wxOutputStream& s);
   virtual ~wxDataOutputStream();


@@ -44,5 +44,11 @@ class wxDataOutputStream: public wxFilterOutputStream {
   void WriteString(const wxString& string);
 };
 
   void WriteString(const wxString& string);
 };
 

+class wxDataStream: public wxDataInputStream, public wxDataOutputStream,
+                    public wxFilterStream {
+ public:
+  wxDataStream(wxStream& stream);
+};
+

 #endif
 #endif

-    // __DATSTREAMH__
+    // _WX_DATSTREAM_H_