Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dll fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (UG)
1998-11-06 09:33:25 +00:00
parent fd0eed647d
commit c33534e597
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/datstrm.h
View File

@@ -18,7 +18,7 @@
#include <wx/stream.h> #include <wx/stream.h>
class wxDataInputStream: public wxFilterInputStream { class WXDLLEXPORT wxDataInputStream: public wxFilterInputStream {
public: public:
wxDataInputStream(wxInputStream& s); wxDataInputStream(wxInputStream& s);
virtual ~wxDataInputStream(); virtual ~wxDataInputStream();
@@ -31,7 +31,7 @@ public:
wxString ReadString(); wxString ReadString();
}; };
class wxDataOutputStream: public wxFilterOutputStream { class WXDLLEXPORT wxDataOutputStream: public wxFilterOutputStream {
public: public:
wxDataOutputStream(wxOutputStream& s); wxDataOutputStream(wxOutputStream& s);
virtual ~wxDataOutputStream(); virtual ~wxDataOutputStream();

15
include/wx/string.h
View File

@@ -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" #error "Please define string case-insensitive compare for your OS/compiler"
#endif // 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);
//@} //@}
//@} //@}