2.5.3 - cleanups, fixes, etc. etc. -
1. Various stubs for wxCocoa (and the bakefile entries for them) 2. Definitions for some wxCocoa cocoa types in defs.h 3. Hack to attempt to fix SYNC sound for mac carbon 4. Fix for wxCocoa and 10.2 (Dave - I'm already around doing some stuff anyway - I'll go ahead and save you the trouble). 5. 10.2 unicode layer 6. Strings null-char fixes (stems from chartraits patch - essentially the patch minus the chartraits part - HAHA :)) [note to self - swap the 2nd and 3rd params of wxMemchr if you use chartraits and vice versa] * If you have time please run the strings and stdstrings cppunit test suite * Also add more test suites if you want - more is always better :) * This does not include any fixes for mbtowc etc functions as outlined on the ml 7. An attempt to update wxArray docs a little 8. wx/process.h build fix for wxCocoa 9. Unicode fixes in app.mm for wxCocoa 10. Remove newer font panel after Stefan's suggestion git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -572,17 +572,15 @@ public:
|
||||
// All compare functions return -1, 0 or 1 if the [sub]string is less,
|
||||
// equal or greater than the compare() argument.
|
||||
|
||||
// just like strcmp()
|
||||
int compare(const wxStringBase& str) const
|
||||
{ return wxStrcmp(c_str(), str.c_str()); }
|
||||
// comparison with another string
|
||||
int compare(const wxStringBase& str) const;
|
||||
// comparison with a substring
|
||||
int compare(size_t nStart, size_t nLen, const wxStringBase& str) const;
|
||||
// comparison of 2 substrings
|
||||
int compare(size_t nStart, size_t nLen,
|
||||
const wxStringBase& str, size_t nStart2, size_t nLen2) const;
|
||||
// just like strcmp()
|
||||
int compare(const wxChar* sz) const
|
||||
{ return wxStrcmp(c_str(), sz); }
|
||||
// comparison with a c string
|
||||
int compare(const wxChar* sz) const;
|
||||
// substring comparison with first nCount characters of sz
|
||||
int compare(size_t nStart, size_t nLen,
|
||||
const wxChar* sz, size_t nCount = npos) const;
|
||||
@@ -971,9 +969,11 @@ public:
|
||||
|
||||
// string comparison
|
||||
// case-sensitive comparison (returns a value < 0, = 0 or > 0)
|
||||
int Cmp(const wxChar *psz) const { return wxStrcmp(c_str(), psz); }
|
||||
int Cmp(const wxChar *psz) const;
|
||||
int Cmp(const wxString& s) const;
|
||||
// same as Cmp() but not case-sensitive
|
||||
int CmpNoCase(const wxChar *psz) const { return wxStricmp(c_str(), psz); }
|
||||
int CmpNoCase(const wxChar *psz) const;
|
||||
int CmpNoCase(const wxString& s) const;
|
||||
// test for the string equality, either considering case or not
|
||||
// (if compareWithCase then the case matters)
|
||||
bool IsSameAs(const wxChar *psz, bool compareWithCase = true) const
|
||||
|
Reference in New Issue
Block a user