Commit 4ff3c320 authored by twanvl's avatar twanvl

compatibility with wxWdigets 2.9+: wxString::c_str now returns an object...

compatibility with wxWdigets 2.9+: wxString::c_str now returns an object instead of a Char*, use cast to force conversion.
TODO: This can probably be done more efficiently!
parent c0e43250
......@@ -155,10 +155,10 @@ size_t in_tag(const String& str, const String& tag, size_t start, size_t end) {
for (size_t pos = 0 ; pos < end ; ) {
Char c = str.GetChar(pos);
if (c == _('<')) {
if (is_substr(str, pos + 1, tag.c_str()+1)) {
if (is_substr(str, pos + 1, static_cast<const Char*>(tag.c_str())+1)) {
if (pos < start) last_start = pos;
++taglevel;
} else if (pos + 2 < size && str.GetChar(pos+1) == _('/') && is_substr(str, pos + 2, tag.c_str()+1)) {
} else if (pos + 2 < size && str.GetChar(pos+1) == _('/') && is_substr(str, pos + 2, static_cast<const Char*>(tag.c_str())+1)) {
--taglevel; // close tag
}
pos = skip_tag(str,pos);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment