From 77a7a5e60bd9e2f4efc30399b2975dbfd722e781 Mon Sep 17 00:00:00 2001
From: danglassey <danglassey>
Date: Tue, 17 Sep 2002 13:01:55 +0000
Subject: sync with crosswire 20020917-1300

---
 apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp')

diff --git a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
index f42ffb1..a304b10 100644
--- a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
@@ -591,10 +591,18 @@ void TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool headin
 		this->SelAttributes->Link = true;
 	}
 	if (Visible) {
+		TComponent *owner = this->Owner;
+		TForm *parentForm = dynamic_cast<TForm *>(owner);
+		TWinControl *focus = 0;
+		
+		if (parentForm)
+			focus = parentForm->ActiveControl;
 		this->SetFocus();
 		SelStart = 0;
 		SelLength = 0;
 		SendMessage(Handle, EM_SCROLLCARET, 0, 0);
+		if (focus)
+			focus->SetFocus();
 	}
 
 	Repaint();
-- 
cgit