From c33534e597932b7f9df583df8de69a4c16d9ae5a Mon Sep 17 00:00:00 2001
From: "Unknown (UG)" <nobody@localhost>
Date: Fri, 6 Nov 1998 09:33:25 +0000
Subject: [PATCH] dll fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/datstrm.h |  4 ++--
 include/wx/string.h  | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index de87a83323..82e7b8daa9 100644
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -18,7 +18,7 @@
 
 #include <wx/stream.h>
 
-class wxDataInputStream: public wxFilterInputStream {
+class WXDLLEXPORT wxDataInputStream: public wxFilterInputStream {
 public:
   wxDataInputStream(wxInputStream& s);
   virtual ~wxDataInputStream();
@@ -31,7 +31,7 @@ public:
   wxString ReadString();
 };
 
-class wxDataOutputStream: public wxFilterOutputStream {
+class WXDLLEXPORT wxDataOutputStream: public wxFilterOutputStream {
  public:
   wxDataOutputStream(wxOutputStream& s);
   virtual ~wxDataOutputStream();
diff --git a/include/wx/string.h b/include/wx/string.h
index e239f8bca7..9afef64858 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -106,6 +106,11 @@ inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
   #error  "Please define string case-insensitive compare for your OS/compiler"
 #endif  // OS/compiler
 }
+wxString WXDLLEXPORT operator+(const wxString& string1,  const wxString& string2);
+wxString WXDLLEXPORT operator+(const wxString& string, char ch);
+wxString WXDLLEXPORT operator+(char ch, const wxString& string);
+wxString WXDLLEXPORT operator+(const wxString& string, const char *psz);
+wxString WXDLLEXPORT operator+(const char *psz, const wxString& string);
 
 // ----------------------------------------------------------------------------
 // global data
@@ -360,15 +365,15 @@ public:
     /** @name return resulting string */
     //@{
       ///
-  friend wxString operator+(const wxString& string1,  const wxString& string2);
+  friend wxString WXDLLEXPORT operator+(const wxString& string1,  const wxString& string2);
       ///
-  friend wxString operator+(const wxString& string, char ch);
+  friend wxString WXDLLEXPORT operator+(const wxString& string, char ch);
       ///
-  friend wxString operator+(char ch, const wxString& string);
+  friend wxString WXDLLEXPORT operator+(char ch, const wxString& string);
       ///
-  friend wxString operator+(const wxString& string, const char *psz);
+  friend wxString WXDLLEXPORT operator+(const wxString& string, const char *psz);
       ///
-  friend wxString operator+(const char *psz, const wxString& string);
+  friend wxString WXDLLEXPORT operator+(const char *psz, const wxString& string);
     //@}
   //@}
 
-- 
2.45.2