neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed problems when compiling with wxWidgets 2.8

This commit is contained in:
Zane U. Ji 2014-04-21 21:02:55 +08:00
parent 2f77ac47ea
commit de0d263bd7
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/xmlctrl.cpp
View File

@ -2239,8 +2239,8 @@ void XmlCtrl::toggleComment()
const static wxString commentStart = _T ( "<!--" ); const static wxString commentStart = _T ( "<!--" );
const static wxString commentEnd = _T ( "-->" ); const static wxString commentEnd = _T ( "-->" );
size_t offset = itr - start; size_t startPos = itr - start;
int ret = text.compare ( offset, commentStart.length(), commentStart ); int ret = text.compare ( startPos, commentStart.length(), commentStart );
if ( ret == 0 ) if ( ret == 0 )
{ {
start = itr; start = itr;
@ -2249,24 +2249,22 @@ void XmlCtrl::toggleComment()
--itr; --itr;
} while ( itr != start && wxIsspace ( *itr ) ); } while ( itr != start && wxIsspace ( *itr ) );
offset = itr - start; size_t endPos = itr - start;
if ( offset > commentEnd.length() ) if ( endPos > commentEnd.length() )
{ {
offset = itr - text.begin() - commentEnd.length() + 1; endPos = itr - text.begin() - commentEnd.length() + 1;
ret = text.compare ( offset, commentEnd.length(), commentEnd ); ret = text.compare ( endPos, commentEnd.length(), commentEnd );
// Is commented? // Is commented?
if ( ret == 0 ) if ( ret == 0 )
{ {
text.erase ( offset, commentEnd.length() ); text.erase ( endPos, commentEnd.length() );
text.erase ( start, start + commentStart.length() ); text.erase ( startPos, commentStart.length() );
ReplaceSelection ( text ); ReplaceSelection ( text );
if ( pos >= 0 )
{
pos -= commentStart.length(); pos -= commentStart.length();
SetEmptySelection ( pos >= 0 ? pos : 0 ); if ( pos >= 0 )
} SetSelection ( pos, pos );
return; return;
} }
} }
@ -2276,7 +2274,7 @@ void XmlCtrl::toggleComment()
// "--" is not allowed in comments // "--" is not allowed in comments
const static wxString doubleHyphen = _T ( "--" ); const static wxString doubleHyphen = _T ( "--" );
offset = 0; size_t offset = 0;
while ( ( offset = text.find ( doubleHyphen, offset ) ) != wxString::npos ) while ( ( offset = text.find ( doubleHyphen, offset ) ) != wxString::npos )
{ {
text.replace ( offset, doubleHyphen.length(), _T ( "- -" ) ); text.replace ( offset, doubleHyphen.length(), _T ( "- -" ) );
@ -2287,5 +2285,8 @@ void XmlCtrl::toggleComment()
ReplaceSelection ( text ); ReplaceSelection ( text );
if ( pos >= 0 ) if ( pos >= 0 )
SetEmptySelection ( pos + commentStart.length() ); {
pos += commentStart.length();
SetSelection ( pos, pos );
}
} }