dll fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index de87a83323daf2f35cd2d7f0d5276aeb76b689f9..82e7b8daa979e5142e79ce5c3e6d74240a9407eb 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -18,7 +18,7 @@
 
 #include <wx/stream.h>
 
 
 #include <wx/stream.h>
 

-class wxDataInputStream: public wxFilterInputStream {
+class WXDLLEXPORT wxDataInputStream: public 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 WXDLLEXPORT wxDataOutputStream: public wxFilterOutputStream {

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

diff --git a/include/wx/string.h b/include/wx/string.h
index e239f8bca782feb06a7159beaa8bed92a7ec2628..9afef648588648b0a926d5de11ce9f34c9c232d5 100644 (file)
--- 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
 }
   #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
 
 // ----------------------------------------------------------------------------
 // global data


@@ -360,15 +365,15 @@ public:
     /** @name return resulting string */
     //@{
       ///
     /** @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);

     //@}
   //@}
 
     //@}
   //@}