no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -106,11 +106,6 @@ 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
|
||||||
@@ -914,6 +909,11 @@ inline bool operator>=(const wxString& s1, const char * s2) { return s1.Cmp(s2)
|
|||||||
///
|
///
|
||||||
inline bool operator>=(const char * s1, const wxString& s2) { return s2.Cmp(s1) <= 0; }
|
inline bool operator>=(const char * s1, const wxString& s2) { return s2.Cmp(s1) <= 0; }
|
||||||
//@}
|
//@}
|
||||||
|
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);
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
/** @name Global functions complementing standard C string library
|
/** @name Global functions complementing standard C string library
|
||||||
|
Reference in New Issue
Block a user