tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from andreas-jonsson/find_ampersands 

Fix ampersands in find dialog status bar.
This commit is contained in:
Don HO 2015-05-02 11:49:36 +02:00
parent 46cb58069f 930464fb8c
commit 2fe9845dbe
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -707,3 +707,13 @@ generic_string stringToUpper(generic_string strToConvert)
return strToConvert; return strToConvert;
} }
generic_string stringReplace(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;
}

1
PowerEditor/src/MISC/Common/Common.h
View File

@ -187,5 +187,6 @@ generic_string PathRemoveFileSpec(generic_string & path);
generic_string PathAppend(generic_string &strDest, const generic_string & str2append); generic_string PathAppend(generic_string &strDest, const generic_string & str2append);
COLORREF getCtrlBgColor(HWND hWnd); COLORREF getCtrlBgColor(HWND hWnd);
generic_string stringToUpper(generic_string strToConvert); generic_string stringToUpper(generic_string strToConvert);
generic_string stringReplace(generic_string subject, const generic_string& search, const generic_string& replace);
#endif //M30_IDE_COMMUN_H #endif //M30_IDE_COMMUN_H

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

@ -1275,7 +1275,7 @@ bool FindReplaceDlg::processFindNext(const TCHAR *txt2find, const FindOption *op
if (NotIncremental == pOptions->_incrementalType) //incremental search doesnt trigger messages if (NotIncremental == pOptions->_incrementalType) //incremental search doesnt trigger messages
{ {
generic_string msg = TEXT("Find: Can't find the text \""); generic_string msg = TEXT("Find: Can't find the text \"");
msg += txt2find; msg += stringReplace(txt2find, TEXT("&"), TEXT("&&"));
msg += TEXT("\""); msg += TEXT("\"");
setStatusbarMessage(msg, FSNotFound); setStatusbarMessage(msg, FSNotFound);