[sword-svn] r465 - branches/BCB5

[chrislit at www.crosswire.org]

Author: chrislit
Date: 2007-09-28 21:09:56 -0700 (Fri, 28 Sep 2007)
New Revision: 465

Modified:
   branches/BCB5/RxRichEditX.cpp
   branches/BCB5/mainfrm.cpp
Log:
added horizontal scrollbars when displaying an image (or, more accurately, changed all display panes to have both H & V scrollbars and turned word-wrap off when displaying an image so that the H scrollbar actually shows up)

Modified: branches/BCB5/RxRichEditX.cpp
===================================================================
--- branches/BCB5/RxRichEditX.cpp	2007-09-29 00:32:38 UTC (rev 464)
+++ branches/BCB5/RxRichEditX.cpp	2007-09-29 04:09:56 UTC (rev 465)
@@ -1056,6 +1056,7 @@
 
 
 void TRxRichEditX::makeImages() {
+	WordWrap = true;
 	while (true) {
 		int start, len, foundAt, endAt;
 
@@ -1068,12 +1069,13 @@
 		endAt = this->SearchText("\" />", foundAt, len, TRichSearchTypes());
 		if (foundAt == -1)
 			break;
+
+               	WordWrap = false;
 		SelStart = foundAt;
 		SelLength = (endAt - foundAt)+4;
 		XMLTag tag(this->SelText.c_str());
 		SelText = "";
 		insertImage(tag.getAttribute("src"));
-
 	}
 }
 

Modified: branches/BCB5/mainfrm.cpp
===================================================================
--- branches/BCB5/mainfrm.cpp	2007-09-29 00:32:38 UTC (rev 464)
+++ branches/BCB5/mainfrm.cpp	2007-09-29 04:09:56 UTC (rev 465)
@@ -207,7 +207,7 @@
 	newtab->PageControl = TextPageControl;
 	newrtf->Parent = newtab;
 	newrtf->Align = alClient;
-	newrtf->ScrollBars = ssVertical;
+	newrtf->ScrollBars = Stdctrls::ssBoth;
 	newrtf->ReadOnly = true;
 	newrtf->PopupMenu = PopupMenu2;
 	newrtf->OnMouseDown = RTFMouseDown;
@@ -238,7 +238,7 @@
 	newtab->PageControl = TextPageControl;
 	parallelDisp->Parent = newtab;
 	parallelDisp->Align = alClient;
-	parallelDisp->ScrollBars = ssVertical;
+	parallelDisp->ScrollBars = Stdctrls::ssBoth;
 	parallelDisp->ReadOnly = true;
 	parallelDisp->PopupMenu = PopupMenu5;
 	parallelDisp->OnMouseDown = RTFMouseDown;
@@ -299,7 +299,7 @@
 		
 		SWDisplay *disp = new RTFDisp((SWDispRTF *)newrtf);
 		mod->Disp(*displays.insert(displays.begin(), disp));
-		((SWDispRTF *)newrtf)->ScrollBars = ssVertical;
+		((SWDispRTF *)newrtf)->ScrollBars = Stdctrls::ssBoth;
 		((SWDispRTF *)newrtf)->ReadOnly = true;
 		((SWDispRTF *)newrtf)->Name = String("CommentRTF")+mod->Name();
 
@@ -335,7 +335,7 @@
 
 	newrtf->Parent = newtab;
 	newrtf->Align = alClient;
-	newrtf->ScrollBars = ssVertical;
+	newrtf->ScrollBars = Stdctrls::ssBoth;
 	newrtf->ReadOnly = true;
 	newrtf->Name = String("LexDictRTF")+mod->Name();
 	newrtf->PopupMenu = PopupMenu2;
@@ -369,7 +369,7 @@
 
 char TForm1::CreateBookPane(SWModule *mod) {
 	TTabSheet *newtab = new TTabSheet(this);
-	   TWinControl *newrtf;
+	TWinControl *newrtf;
 	char buf[1024];
 	SectionMap::iterator sit;
 	TTreeView *toc = new TTreeView(this);
@@ -391,7 +391,7 @@
 	newrtf = new SWDispRTF(this);
 	SWDisplay *disp = new RTFBookDisp((SWDispRTF *)newrtf, toc);
 	mod->Disp(*displays.insert(displays.begin(), disp));
-	((SWDispRTF *)newrtf)->ScrollBars = ssVertical;
+	((SWDispRTF *)newrtf)->ScrollBars = Stdctrls::ssBoth;
 	((SWDispRTF *)newrtf)->ReadOnly = true;
 
 	((SWDispRTF *)newrtf)->PopupMenu = PopupMenu2;
@@ -399,7 +399,7 @@
 	newrtf->Name = String("BookRTF")+mod->Name();
 	newrtf->Parent = newtab;
 	newrtf->Align = alClient;
-	((SWDispRTF *)newrtf)->OnURLClick = RTFURLClick;		
+	((SWDispRTF *)newrtf)->OnURLClick = RTFURLClick;
 	((SWDispRTF *)newrtf)->module = mod;
 	((SWDispRTF *)newrtf)->recalcAppearance();