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

[BUG_FIXED] Fix macro recoding for find in files regression. 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@655 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2010-08-25 01:38:20 +00:00
parent c1ff1bfafb
commit 6da146a4ec
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1424,7 +1424,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const FindOption *opt, bool
endPosition = docLength; endPosition = docLength;
} }
return processRange(op, txt2find, txt2replace, startPosition, endPosition, fileName, opt, colourStyleID); return processRange(op, txt2find, txt2replace, startPosition, endPosition, fileName, pOptions, colourStyleID);
} }
int FindReplaceDlg::processRange(ProcessOperation op, const TCHAR *txt2find, const TCHAR *txt2replace, int startRange, int endRange, const TCHAR *fileName, const FindOption *opt, int colourStyleID) int FindReplaceDlg::processRange(ProcessOperation op, const TCHAR *txt2find, const TCHAR *txt2replace, int startRange, int endRange, const TCHAR *fileName, const FindOption *opt, int colourStyleID)
@ -2068,6 +2068,9 @@ void FindReplaceDlg::initOptionsFromDlg()
_options._doMarkLine = isCheckedOrNot(IDC_MARKLINE_CHECK); _options._doMarkLine = isCheckedOrNot(IDC_MARKLINE_CHECK);
_options._doStyleFoundToken = isCheckedOrNot(IDC_STYLEFOUND_CHECK); _options._doStyleFoundToken = isCheckedOrNot(IDC_STYLEFOUND_CHECK);
_options._isRecursive = isCheckedOrNot(IDD_FINDINFILES_RECURSIVE_CHECK);
_options._isInHiddenDir = isCheckedOrNot(IDD_FINDINFILES_INHIDDENDIR_CHECK);
::EnableWindow(::GetDlgItem(_hSelf, IDCMARKALL), (_options._doMarkLine || _options._doStyleFoundToken)); ::EnableWindow(::GetDlgItem(_hSelf, IDCMARKALL), (_options._doMarkLine || _options._doStyleFoundToken));
} }

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

@ -82,7 +82,7 @@ struct FindOption
FindOption() : _isWholeWord(true), _isMatchCase(true), _searchType(FindNormal),\ FindOption() : _isWholeWord(true), _isMatchCase(true), _searchType(FindNormal),\
_isWrapAround(true), _whichDirection(DIR_DOWN), _incrementalType(NotIncremental), _isWrapAround(true), _whichDirection(DIR_DOWN), _incrementalType(NotIncremental),
_doPurge(false), _doMarkLine(false), _doStyleFoundToken(false), _doPurge(false), _doMarkLine(false), _doStyleFoundToken(false),
_isInSelection(false), _isRecursive(false), _isInHiddenDir(false), _isInSelection(false), _isRecursive(true), _isInHiddenDir(false),
_filters(TEXT("")), _directory(TEXT("")) {}; _filters(TEXT("")), _directory(TEXT("")) {};
}; };