[sword-svn] r413 - trunk

[scribe at crosswire.org]

Author: scribe
Date: 2005-04-10 13:57:21 -0700 (Sun, 10 Apr 2005)
New Revision: 413

Modified:
   trunk/RxRichEditX.cpp
   trunk/TModuleFonts.cpp
   trunk/mainfrm.cpp
   trunk/swdisprtfchap.cpp
   trunk/vrslstfrm.cpp
Log:


Modified: trunk/RxRichEditX.cpp
===================================================================
--- trunk/RxRichEditX.cpp	2005-02-11 19:52:52 UTC (rev 412)
+++ trunk/RxRichEditX.cpp	2005-04-10 20:57:21 UTC (rev 413)
@@ -277,6 +277,7 @@
 	Repaint();
 
 	delete RTFStream;
+	makeLinks();
 }
 
 
@@ -1056,6 +1057,7 @@
 
 
 void TRxRichEditX::insertImage(const char *filePath) {
+/*
 //static char *tmp = "D:/Program Files/Borland/Borland Shared/Images/Buttons/alarm.bmp";
 //filePath=tmp;
 	TImage *image = new TImage(this);
@@ -1088,6 +1090,7 @@
 	delete ji;
 	delete image;
 	delete bitmap;
+*/
 }
 
 

Modified: trunk/TModuleFonts.cpp
===================================================================
--- trunk/TModuleFonts.cpp	2005-02-11 19:52:52 UTC (rev 412)
+++ trunk/TModuleFonts.cpp	2005-04-10 20:57:21 UTC (rev 413)
@@ -18,11 +18,11 @@
 	cmbFontSel = new TFontComboBox(this);
 	cmbFontSel->Parent = pnlFontComboBox;
 	cmbFontSel->Align = alClient;
-//    cmbFontSel->Font->Height = -15;
-    cmbFontSel->ParentFont = true;
-    cmbFontSel->UseFonts = true;
-    cmbFontSel->ItemIndex = cmbFontSel->Items->IndexOf("Arial");
-    cmbFontSel->OnChange = cmbFontSelChange;
+//	cmbFontSel->Font->Height = -15;
+	cmbFontSel->ParentFont = true;
+	cmbFontSel->UseFonts = true;
+	cmbFontSel->ItemIndex = cmbFontSel->Items->IndexOf("Arial");
+	cmbFontSel->OnChange = cmbFontSelChange;
 }
 //---------------------------------------------------------------------------
 void __fastcall TModuleFonts::FormShow(TObject *Sender)
@@ -39,7 +39,7 @@
 //---------------------------------------------------------------------------
 void __fastcall TModuleFonts::viewUnicodeClick(TObject *Sender)
 {
-   	viewUnicode->Checked = true;
+	viewUnicode->Checked = true;
     viewAll->Checked = false;
     FillList();
 }
@@ -64,7 +64,7 @@
 				break;
 			}
 		}
-        if(mods->second->isUnicode() || viewAll->Checked){
+//	   if (mods->second->isUnicode() || viewAll->Checked){
 			if (!node) {	// Add Section
 				if (!strncmp(mods->second->Type(), "Bibl", 4))	// If Bibles, put first in list
 					node = installTree->Items->AddChildFirst(0, mods->second->Type());
@@ -75,8 +75,8 @@
 			nodeName += "] ";
 			nodeName += mods->second->Description();
 			node = installTree->Items->AddChildObject(node, nodeName.c_str(), mods->second->Name());
-        }
-    }
+	   }
+//    }
 	//for (node = installTree->Items->GetFirstNode(); node; node = node->getNextSibling())
 	//	node->Expand(true);
 	node = installTree->Items->GetFirstNode();
@@ -85,7 +85,7 @@
 
 }
 void __fastcall TModuleFonts::installTreeChange(TObject *Sender,
-      TTreeNode *Node)
+	 TTreeNode *Node)
 {
     TTreeNode* currNode = installTree->Selected;
 	BibleCSMGR *manager;

Modified: trunk/mainfrm.cpp
===================================================================
--- trunk/mainfrm.cpp	2005-02-11 19:52:52 UTC (rev 412)
+++ trunk/mainfrm.cpp	2005-04-10 20:57:21 UTC (rev 413)
@@ -1875,7 +1875,7 @@
 {
 	WideString message = _tr("Are you sure you wish to delete this entry?");
 	WideString header = _tr("Delete Entry");
-	if (MessageBoxW(Handle, message, header, MB_YESNO) == IDYES) {
+	if (MessageBoxW(Handle, message.c_bstr(), header.c_bstr(), MB_YESNO) == IDYES) {
 		SWDispRTF *rtf = (SWDispRTF *)Screen->ActiveControl;
 		SWModule *module;
 		ModMap::iterator target;

Modified: trunk/swdisprtfchap.cpp
===================================================================
--- trunk/swdisprtfchap.cpp	2005-02-11 19:52:52 UTC (rev 412)
+++ trunk/swdisprtfchap.cpp	2005-04-10 20:57:21 UTC (rev 413)
@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <io.h>
 
-using namespace std;
+//using namespace std;
 
 //---------------------------------------------------------------------------
 static inline SWDispRTFChap *ValidCtrCheck()
@@ -79,9 +79,9 @@
 	}
 
 	Module.Error(); // clear error;
-	string lastEntry = "something the first entry will never be";
+	SWBuf lastEntry = "something the first entry will never be";
 	while ((key->Book() == book) && (key->Chapter() == chap) && (Module.Error() == 0)) {
-		if (lastEntry == (string)Module.getRawEntry()) {
+		if (lastEntry == (SWBuf)Module.getRawEntry()) {
 			Module++;
 			continue;
 		}

Modified: trunk/vrslstfrm.cpp
===================================================================
--- trunk/vrslstfrm.cpp	2005-02-11 19:52:52 UTC (rev 412)
+++ trunk/vrslstfrm.cpp	2005-04-10 20:57:21 UTC (rev 413)
@@ -153,7 +153,7 @@
 		if (FileMgr::existsFile(VLSaveDialog->FileName.c_str())) {
 			WideString message = _tr("File exists.  Overwrite?");
 			WideString header = _tr("Overwrite File");
-			if (MessageBoxW(Handle, message, header, MB_YESNO) != IDYES) {
+			if (MessageBoxW(Handle, message.c_bstr(), header.c_bstr(), MB_YESNO) != IDYES) {
 				return;
 			}
 		}