projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a helper wxApp::GetValidTraits() method.
[wxWidgets.git]
/
src
/
common
/
stringops.cpp
diff --git
a/src/common/stringops.cpp
b/src/common/stringops.cpp
index 599c05c1d02cb685cc85c2929328a4bf317b1ba8..ff44bcd182d97ae9bc32752e92ac564da417d332 100644
(file)
--- a/
src/common/stringops.cpp
+++ b/
src/common/stringops.cpp
@@
-254,7
+254,6
@@
wxStringOperationsUtf8::DecodeNonAsciiChar(wxStringImpl::const_iterator i)
{
wxASSERT( IsValidUtf8LeadByte(*i) );
{
wxASSERT( IsValidUtf8LeadByte(*i) );
- wxUniChar::value_type code = 0;
size_t len = GetUtf8CharLength(*i);
wxASSERT_MSG( len <= 4, wxT("invalid UTF-8 sequence length") );
size_t len = GetUtf8CharLength(*i);
wxASSERT_MSG( len <= 4, wxT("invalid UTF-8 sequence length") );
@@
-282,7
+281,7
@@
wxStringOperationsUtf8::DecodeNonAsciiChar(wxStringImpl::const_iterator i)
wxASSERT_MSG( ((unsigned char)*i & s_leadMarkerMask[len-1]) ==
s_leadMarkerVal[len-1],
wxT("invalid UTF-8 lead byte") );
wxASSERT_MSG( ((unsigned char)*i & s_leadMarkerMask[len-1]) ==
s_leadMarkerVal[len-1],
wxT("invalid UTF-8 lead byte") );
- code = (unsigned char)*i & s_leadValueMask[len-1];
+
wxUniChar::value_type
code = (unsigned char)*i & s_leadValueMask[len-1];
// all remaining bytes, if any, are handled in the same way regardless of
// sequence's length:
// all remaining bytes, if any, are handled in the same way regardless of
// sequence's length: