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

[BUG_FIXED] Fix NPPM_LAUNCHFINDINFILESDLG API regression issue.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1315 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2014-12-24 02:03:52 +00:00
parent 36a6f0931b
commit 15542d7c8d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PowerEditor/src/NppBigSwitch.cpp
View File

@ -214,7 +214,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
} }
case NPPM_LAUNCHFINDINFILESDLG : case NPPM_LAUNCHFINDINFILESDLG :
{ {
/* // Find in files function code should be here due to the number of parameters (2) cannot be passed via WM_COMMAND
const int strSize = FINDREPLACE_MAXLENGTH; const int strSize = FINDREPLACE_MAXLENGTH;
TCHAR str[strSize]; TCHAR str[strSize];
@ -228,9 +228,6 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
_findReplaceDlg.launchFindInFilesDlg(); _findReplaceDlg.launchFindInFilesDlg();
setFindReplaceFolderFilter((const TCHAR*) wParam, (const TCHAR*) lParam); setFindReplaceFolderFilter((const TCHAR*) wParam, (const TCHAR*) lParam);
return TRUE; return TRUE;
*/
return ::SendMessage(_pPublicInterface->getHSelf(), WM_COMMAND, IDM_SEARCH_FINDINFILES, 0);
} }
case NPPM_DOOPEN: case NPPM_DOOPEN:

6
PowerEditor/src/NppCommands.cpp
View File

@ -612,7 +612,6 @@ void Notepad_plus::command(int id)
case IDM_SEARCH_FIND : case IDM_SEARCH_FIND :
case IDM_SEARCH_REPLACE : case IDM_SEARCH_REPLACE :
case IDM_SEARCH_FINDINFILES:
case IDM_SEARCH_MARK : case IDM_SEARCH_MARK :
{ {
const int strSize = FINDREPLACE_MAXLENGTH; const int strSize = FINDREPLACE_MAXLENGTH;
@ -623,8 +622,6 @@ void Notepad_plus::command(int id)
DIALOG_TYPE dlgID = FIND_DLG; DIALOG_TYPE dlgID = FIND_DLG;
if (id == IDM_SEARCH_REPLACE) if (id == IDM_SEARCH_REPLACE)
dlgID = REPLACE_DLG; dlgID = REPLACE_DLG;
else if (id == IDM_SEARCH_FINDINFILES)
dlgID = FINDINFILES_DLG;
else if (id == IDM_SEARCH_MARK) else if (id == IDM_SEARCH_MARK)
dlgID = MARK_DLG; dlgID = MARK_DLG;
_findReplaceDlg.doDialog(dlgID, _nativeLangSpeaker.isRTL()); _findReplaceDlg.doDialog(dlgID, _nativeLangSpeaker.isRTL());
@ -638,13 +635,12 @@ void Notepad_plus::command(int id)
break; break;
} }
/*
case IDM_SEARCH_FINDINFILES: case IDM_SEARCH_FINDINFILES:
{ {
::SendMessage(_pPublicInterface->getHSelf(), NPPM_LAUNCHFINDINFILESDLG, 0, 0); ::SendMessage(_pPublicInterface->getHSelf(), NPPM_LAUNCHFINDINFILESDLG, 0, 0);
break; break;
} }
*/
case IDM_SEARCH_FINDINCREMENT : case IDM_SEARCH_FINDINCREMENT :
{ {
const int strSize = FINDREPLACE_MAXLENGTH; const int strSize = FINDREPLACE_MAXLENGTH;