From: Peter T. <pe...@us...> - 2004-10-12 20:29:19
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30700/run Modified Files: JvFindReplace.pas Log Message: - Mantis 2212, 2213, 2214, 2215 Index: JvFindReplace.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvFindReplace.pas,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** JvFindReplace.pas 1 Sep 2004 15:06:42 -0000 1.21 --- JvFindReplace.pas 12 Oct 2004 20:29:09 -0000 1.22 *************** *** 144,148 **** procedure Error; begin ! EJVCLException.CreateRes(@RsENoEditAssigned); end; --- 144,148 ---- procedure Error; begin ! raise EJVCLException.CreateRes(@RsENoEditAssigned); end; *************** *** 259,263 **** // S := Copy(Text, Result.StartAt - 1, Result.EndAt + 3); S := Copy(Text, Result.StartAt - 1, Result.EndAt + 2); ! Result.isWhole := IsValidWholeWord(S); // S := Copy(S, 3, Length(S) - 3); // Result.isSameCase := (AnsiCompareStr(Search, S) = 0); --- 259,263 ---- // S := Copy(Text, Result.StartAt - 1, Result.EndAt + 3); S := Copy(Text, Result.StartAt - 1, Result.EndAt + 2); ! Result.isWhole := IsValidWholeWord(S) or AnsiSameText(S, Text); // S := Copy(S, 3, Length(S) - 3); // Result.isSameCase := (AnsiCompareStr(Search, S) = 0); *************** *** 328,331 **** --- 328,332 ---- Error; Terminate := False; + UpdateDialogs; TmpOptions := FReplaceDialog.Options; Txt := FEditControl.Text; *************** *** 411,414 **** --- 412,416 ---- begin FFindDialog := TFindDialog.Create(Self); + FFindDialog.FindText := FFindText; FFindDialog.OnFind := DoOnFind; end; *************** *** 416,419 **** --- 418,423 ---- begin FReplaceDialog := TReplaceDialog.Create(Self); + FReplaceDialog.FindText := FFindText; + FReplaceDialog.ReplaceText := FReplaceText; FReplaceDialog.OnFind := DoOnFind; FReplaceDialog.OnReplace := DoOnReplace; *************** *** 634,642 **** begin FFindText := Value; ! if Assigned(FFindDialog) and Assigned(FReplaceDialog) then ! begin FFindDialog.FindText := Value; FReplaceDialog.FindText := Value; - end; end; --- 638,645 ---- begin FFindText := Value; ! if Assigned(FFindDialog) then FFindDialog.FindText := Value; + if Assigned(FReplaceDialog) then FReplaceDialog.FindText := Value; end; |