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

wxCStrData must be dllexport'd now that it has non-inline methods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-06 22:48:54 +00:00
parent 90f58090f6
commit 9aee0061fe
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/string.h
View File

@@ -169,7 +169,7 @@ inline int Stricmp(const char *psz1, const char *psz2)
// Lightweight object returned by wxString::c_str() and implicitly convertible // Lightweight object returned by wxString::c_str() and implicitly convertible
// to either const char* or const wchar_t*. // to either const char* or const wchar_t*.
class wxCStrData class WXDLLIMPEXP_BASE wxCStrData
{ {
private: private:
// Ctors; for internal use by wxString and wxCStrData only // Ctors; for internal use by wxString and wxCStrData only
@@ -182,13 +182,22 @@ public:
wxCStrData(char *buf); wxCStrData(char *buf);
wxCStrData(wchar_t *buf); wxCStrData(wchar_t *buf);
~wxCStrData(); inline ~wxCStrData();
// methods defined inline below must be declared inline or mingw32 3.4.5
// warns about "<symbol> defined locally after being referenced with
// dllimport linkage"
#if wxUSE_UNICODE_WCHAR
inline
#endif
const wchar_t* AsWChar() const; const wchar_t* AsWChar() const;
operator const wchar_t*() const { return AsWChar(); } operator const wchar_t*() const { return AsWChar(); }
operator bool() const; inline operator bool() const;
#if !wxUSE_UNICODE
inline
#endif
const char* AsChar() const; const char* AsChar() const;
const unsigned char* AsUnsignedChar() const const unsigned char* AsUnsignedChar() const
{ return (const unsigned char *) AsChar(); } { return (const unsigned char *) AsChar(); }
@@ -197,11 +206,11 @@ public:
operator const void*() const { return AsChar(); } operator const void*() const { return AsChar(); }
wxString AsString() const; inline wxString AsString() const;
// allow expressions like "c_str()[0]": // allow expressions like "c_str()[0]":
inline wxUniChar operator[](size_t n) const;
wxUniChar operator[](int n) const { return operator[](size_t(n)); } wxUniChar operator[](int n) const { return operator[](size_t(n)); }
wxUniChar operator[](size_t n) const;
wxUniChar operator[](long n) const { return operator[](size_t(n)); } wxUniChar operator[](long n) const { return operator[](size_t(n)); }
#ifndef wxSIZE_T_IS_UINT #ifndef wxSIZE_T_IS_UINT
wxUniChar operator[](unsigned int n) const { return operator[](size_t(n)); } wxUniChar operator[](unsigned int n) const { return operator[](size_t(n)); }
@@ -239,7 +248,7 @@ public:
// this operator is needed to make expressions like "*c_str()" or // this operator is needed to make expressions like "*c_str()" or
// "*(c_str() + 2)" work // "*(c_str() + 2)" work
wxUniChar operator*() const; inline wxUniChar operator*() const;
private: private:
const wxString *m_str; const wxString *m_str;