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

Don't call different variants of wxString methods overloads

Browse Source 
The function such as fn_str(), wc_str(), and ToAscii() have
configuration-dependent return types, yet different variants were claimed to
be member function overloads. This is incorrect, as a member function cannot
be overloaded only by its return type and, for any given platform/build
variant only one of them is available.

Closes https://github.com/wxWidgets/wxWidgets/pull/260
This commit is contained in:
Lauri Nurmi
2016-03-25 10:40:58 +02:00
committed by Vadim Zeitlin
parent e07aa294a4
commit 55d77f271e
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
interface/wx/string.h
View File

@@ -656,18 +656,11 @@ public:
/** /**
Returns a string representation suitable for passing to OS' functions Returns a string representation suitable for passing to OS' functions
for file handling. for file handling.
*/
const wchar_t* fn_str() const;
/** Depending on OS and configuration, TYPE is either @c wchar_t*,
@overload @c char*, or wxCharBuffer.
*/ */
const char* fn_str() const; const TYPE fn_str() const;
/**
@overload
*/
const wxCharBuffer fn_str() const;
/** /**
Returns the multibyte (C string) representation of the string Returns the multibyte (C string) representation of the string
@@ -692,16 +685,14 @@ public:
or returns a pointer to the internal string contents in wide character or returns a pointer to the internal string contents in wide character
mode (Windows). mode (Windows).
Depending on OS and configuration, TYPE is either @c wchar_t*
or wxCharBuffer.
The macro wxWX2WCbuf is defined as the correct return type (without const). The macro wxWX2WCbuf is defined as the correct return type (without const).
@see utf8_str(), c_str(), mb_str(), fn_str(), wchar_str() @see utf8_str(), c_str(), mb_str(), fn_str(), wchar_str()
*/ */
const wchar_t* wc_str() const; const TYPE wc_str() const;
/**
@overload
*/
const wxWCharBuffer wc_str() const;
/** /**
Returns an object with string data that is implicitly convertible to Returns an object with string data that is implicitly convertible to
@@ -744,16 +735,14 @@ public:
Use mb_str() or utf8_str() to convert to other encodings. Use mb_str() or utf8_str() to convert to other encodings.
Depending on OS and configuration, TYPE is either @c char* or
wxCharBuffer.
@param replaceWith @param replaceWith
The character used to replace any non-ASCII characters, default to The character used to replace any non-ASCII characters, default to
underscore (@c "_"). This parameter is new since wxWidgets 3.1.0. underscore (@c "_"). This parameter is new since wxWidgets 3.1.0.
*/ */
const char* ToAscii(char replaceWith = '_') const; const TYPE ToAscii(char replaceWith = '_') const;
/**
@overload
*/
const wxCharBuffer ToAscii(char replaceWith = '_') const;
/** /**
Return the string as an std::string in current locale encoding. Return the string as an std::string in current locale encoding.