Various small fixes

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index d329626d124763591fab22c9aa05fb6b4f5ee98c..82e7b8daa979e5142e79ce5c3e6d74240a9407eb 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,8 +18,7 @@
 
 #include <wx/stream.h>
 
 
 #include <wx/stream.h>
 

-class wxDataInputStream: public wxFilterInputStream {
-  DECLARE_CLASS(wxDataInputStream)
+class WXDLLEXPORT wxDataInputStream: public wxFilterInputStream {

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


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

-class wxDataOutputStream: public wxFilterOutputStream {
-  DECLARE_CLASS(wxDataOutputStream)
+class WXDLLEXPORT wxDataOutputStream: public wxFilterOutputStream {

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


@@ -47,4 +45,4 @@ class wxDataOutputStream: public wxFilterOutputStream {
 };
 
 #endif
 };
 
 #endif

-    // __DATSTREAMH__
+    // _WX_DATSTREAM_H_