Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ampersands in find dialog status bar.

Browse Source
This commit is contained in:
Andreas Jönsson 2015-04-24 19:18:54 +02:00
parent ac61c43d15
commit 5bacca3601
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -1146,6 +1146,18 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
return FALSE;
}
generic_string replaceString(generic_string subject, const generic_string& search, const generic_string& replace)
{
size_t pos = 0;
while ((pos = subject.find(search, pos)) != std::string::npos)
{
subject.replace(pos, search.length(), replace);
pos += replace.length();
}
return subject;
}
// return value :
// true : the text2find is found
// false : the text2find is not found
@ -1275,7 +1287,8 @@ bool FindReplaceDlg::processFindNext(const TCHAR *txt2find, const FindOption *op
if (NotIncremental == pOptions->_incrementalType) //incremental search doesnt trigger messages
{
generic_string msg = TEXT("Find: Can't find the text \"");
msg += txt2find;
generic_string txt2find_escaped = replaceString(txt2find, TEXT("&"), TEXT("&&"));
msg += txt2find_escaped;
msg += TEXT("\"");
setStatusbarMessage(msg, FSNotFound);