[sword-cvs] sword/apps/windoze swdisprtf.cpp,1.16,1.17 swdisprtfchap.cpp,1.21,1.22

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/apps/windoze
In directory www:/tmp/cvs-serv11696/apps/windoze

Modified Files:
	swdisprtf.cpp swdisprtfchap.cpp 
Log Message:
added figure support

Index: swdisprtf.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/swdisprtf.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- swdisprtf.cpp	30 Mar 2003 23:19:20 -0000	1.16
+++ swdisprtf.cpp	6 Aug 2003 10:34:36 -0000	1.17
@@ -80,48 +80,9 @@
 	RTFStream->Position = 0;
 	Lines->LoadFromStream(RTFStream);
 
-	// make links
-	while (true) {
-		int start, len, foundAt, endAt;
-
-		start = (SelLength) ? SelStart + SelLength : 0;
-		len = Text.Length() - start;
-		foundAt = this->SearchText("<a href=\"\">", start, len, TRichSearchTypes());
-		if (foundAt == -1)
-			break;
-
-		SelStart = foundAt;
-		SelLength = 11;
-		this->SelText = "";
-		endAt = this->SearchText("</a>", foundAt, len, TRichSearchTypes());
-		if (foundAt == -1)
-			break;
-		SelStart = endAt;
-		SelLength = 4;
-		this->SelText = "";
-		SelStart = foundAt;
-		SelLength = endAt - foundAt;
-		this->SelAttributes->Link = true;
-	}
-	//{ Position control text at current verse }
-	SelStart = 0;
-/*
-	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();
-	}
-*/
-	SelLength = 0;
+	makeLinks();
+	makeImages();
+	
 	SendMessage(Handle, EM_SCROLLCARET, 0, 0);
 
 	return 0;

Index: swdisprtfchap.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/swdisprtfchap.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- swdisprtfchap.cpp	22 Jun 2003 23:50:23 -0000	1.21
+++ swdisprtfchap.cpp	6 Aug 2003 10:34:36 -0000	1.22
@@ -127,6 +127,7 @@
 			RTFStream->Position = 0;
 			Lines->LoadFromStream(RTFStream);
 			makeLinks();
+			makeImages();
 			versepos =  GetTextLen() - 3;
 		}
 		newtext = newtext + "}";
@@ -147,6 +148,7 @@
        	Lines->LoadFromStream(RTFStream);
         
 	makeLinks();
+	makeImages();
 	
 	//{ Position control text at current verse }
 	this->SetFocus();