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

build fixes after previous commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-04-04 11:40:36 +00:00
parent 33c2a4b7e2
commit e8f5903971
2 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/string.h
View File

@@ -399,18 +399,22 @@ private:
// returns C string encoded as the implementation expects: // returns C string encoded as the implementation expects:
#if wxUSE_UNICODE #if wxUSE_UNICODE
static const wchar_t* ImplStr(const wchar_t* str) static const wchar_t* ImplStr(const wchar_t* str)
{ return str; } { return str ? str : wxT(""); }
static const SubstrBufFromWC ImplStr(const wchar_t* str, size_t n) static const SubstrBufFromWC ImplStr(const wchar_t* str, size_t n)
{ return SubstrBufFromWC(str, n == npos ? wxWcslen(str) : n); } { return SubstrBufFromWC(str, (str && n == npos) ? wxWcslen(str) : n); }
static wxWCharBuffer ImplStr(const char* str) static wxWCharBuffer ImplStr(const char* str,
{ return ConvertStr(str, npos, wxConvLibc).data; } const wxMBConv& conv = wxConvLibc)
static SubstrBufFromMB ImplStr(const char* str, size_t n) { return ConvertStr(str, npos, conv).data; }
{ return ConvertStr(str, n, wxConvLibc); } static SubstrBufFromMB ImplStr(const char* str, size_t n,
const wxMBConv& conv = wxConvLibc)
{ return ConvertStr(str, n, conv); }
#else #else
static const char* ImplStr(const char* str) static const char* ImplStr(const char* str,
{ return str; } const wxMBConv& WXUNUSED(conv) = wxConvLibc)
static const SubstrBufFromMB ImplStr(const char* str, size_t n) { return str ? str : ""; }
{ return SubstrBufFromMB(str, n == npos ? wxStrlen(str) : n); } static const SubstrBufFromMB ImplStr(const char* str, size_t n,
const wxMBConv& WXUNUSED(conv) = wxConvLibc)
{ return SubstrBufFromMB(str, (str && n == npos) ? wxStrlen(str) : n); }
static wxCharBuffer ImplStr(const wchar_t* str) static wxCharBuffer ImplStr(const wchar_t* str)
{ return ConvertStr(str, npos, wxConvLibc).data; } { return ConvertStr(str, npos, wxConvLibc).data; }
static SubstrBufFromWC ImplStr(const wchar_t* str, size_t n) static SubstrBufFromWC ImplStr(const wchar_t* str, size_t n)

22
src/common/string.cpp
View File

@@ -210,29 +210,9 @@ void wxString::UngetWriteBuf(size_t nLen)
// all functions are inline in string.h // all functions are inline in string.h
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// assignment operators // concatenation operators
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#if !wxUSE_UNICODE
// same as 'signed char' variant
wxString& wxString::operator=(const unsigned char* psz)
{
*this = (const char *)psz;
return *this;
}
#if wxUSE_WCHAR_T
wxString& wxString::operator=(const wchar_t *pwz)
{
wxString str(pwz);
swap(str);
return *this;
}
#endif
#endif
/* /*
* concatenation functions come in 5 flavours: * concatenation functions come in 5 flavours:
* string + string * string + string