X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfr1.C;h=f6d575f7427ea3a3857f5ec10b2c9647a9ea5194;hb=f65b7ff4ab2fe8ad0d9196c231064240e3fde81f;hp=13c928b5b5905a15a1da17903251f092ccf264e8;hpb=60a085fb1ca08f534ba02143606d8393ade58b25;p=lyx.git

diff --git a/src/lyxfr1.C b/src/lyxfr1.C
index 13c928b5b5..f6d575f742 100644
--- a/src/lyxfr1.C
+++ b/src/lyxfr1.C
@@ -82,7 +82,7 @@ void SetSelectionOverLenChars(BufferView * bv, int len)
 	bv->text->sel_cursor = bv->text->cursor;
 	for (int i = 0; i < len; ++i)
 		bv->text->CursorRight(bv);
-	bv->text->SetSelection();
+	bv->text->SetSelection(bv);
 }
 
 
@@ -120,7 +120,7 @@ void LyXFindReplace::SearchReplaceCB()
 	// in order to avoid endless loop :-(
 	if (SF.SearchString().length() == 0
 	    || (SF.SearchString().length() == 1
-		&& SF.SearchString()[0] == ' ') ) {
+		&& SF.SearchString()[0] == ' ')) {
 		WriteAlert(_("Sorry!"), _("You cannot replace a single space, "
 					  "nor an empty character."));
 		return;
@@ -129,17 +129,17 @@ void LyXFindReplace::SearchReplaceCB()
 	string const replacestring = SF.ReplaceString();
 
 	bv->hideCursor();
-	bv->update(BufferView::SELECT|BufferView::FITCUR);
+	bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
 
 	LyXText * ltCur = bv->text;	
 	if (ltCur->selection) {
 		// clear the selection (if there is any) 
 		bv->toggleSelection(false);
 		bv->text->
-			ReplaceSelectionWithString(bv, replacestring.c_str());
+			ReplaceSelectionWithString(bv, replacestring);
 		bv->text->
-			SetSelectionOverString(bv, replacestring.c_str());
-		bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+			SetSelectionOverString(bv, replacestring);
+		bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 	}
 	
 	// jump to next match:
@@ -157,7 +157,7 @@ void LyXFindReplace::SearchReplaceAllCB()
 	// in order to avoid endless loop :-(
 	if (SF.SearchString().length() == 0
 	    || (SF.SearchString().length() == 1
-		&& SF.SearchString()[0] == ' ') ) {
+		&& SF.SearchString()[0] == ' ')) {
 		WriteAlert(_("Sorry!"), _("You cannot replace a single space, "
 					  "nor an empty character."));
 		return;
@@ -168,7 +168,7 @@ void LyXFindReplace::SearchReplaceAllCB()
 	bv->hideCursor();
 
 	// start at top
-	bv->text->ClearSelection();
+	bv->text->ClearSelection(bv);
 	bv->text->CursorTop(bv);
 
 	int replace_count = 0;
@@ -176,18 +176,17 @@ void LyXFindReplace::SearchReplaceAllCB()
 	do {
 		ltCur = bv->text;	
 		if (ltCur->selection) {
-			bv->update(BufferView::SELECT|BufferView::FITCUR);
+			bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
 			bv->toggleSelection(false);
 			bv->text->
-				ReplaceSelectionWithString(bv, replacestring.c_str());
+				ReplaceSelectionWithString(bv, replacestring);
 			bv->text->
-				SetSelectionOverString(bv, replacestring.c_str());
-			bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); 
+				SetSelectionOverString(bv, replacestring);
+			bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); 
 			++replace_count;
 		}
 	} while (SearchCB(true));
-	if( replace_count == 0 ) {
-		LyXBell();	
+	if (replace_count == 0) {
 		bv->owner()->getMiniBuffer()->Set(
 			_("String not found!"));
 	} else {
@@ -212,7 +211,7 @@ bool LyXFindReplace::SearchCB(bool fForward)
 		return false;
    
 	bv->hideCursor();
-	bv->update(BufferView::SELECT|BufferView::FITCUR);
+	bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
 	LyXText * ltCur = bv->text;
 	if (ltCur->selection) 
 		ltCur->cursor = fForward ? ltCur->sel_end_cursor :
@@ -223,11 +222,11 @@ bool LyXFindReplace::SearchCB(bool fForward)
    
 	if (!SF.ValidSearchData() ||
 	    (fForward ? SearchForward(bv):SearchBackward(bv))) {
-		bv->update(BufferView::SELECT|BufferView::FITCUR);
+		bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
 
 		// clear the selection (if there is any) 
 		bv->toggleSelection();
-		bv->text->ClearSelection();
+		bv->text->ClearSelection(bv);
 
 		// set the new selection 
 		SetSelectionOverLenChars(bv, iLenSelected);
@@ -235,7 +234,6 @@ bool LyXFindReplace::SearchCB(bool fForward)
 		bv->owner()->getMiniBuffer()->Set(_("Found."));
 		result = true;
 	} else {
-		LyXBell();
 		bv->owner()->getMiniBuffer()->Set(_("String not found!"));
 		result = false;
 	}