[sword-cvs] swordreader/src/gui SwordIndex.cpp,1.3,1.4 gui.vcl,1.3,1.4

[sword@www.crosswire.org]

Update of /cvs/core/swordreader/src/gui
In directory www:/tmp/cvs-serv25679/src/gui

Modified Files:
	SwordIndex.cpp gui.vcl 
Log Message:
changed fd to be a HANDLE * to circumvent the unsigned nature of HANDLE (which was giving me negative fd values)
I can't believe it, but it seems like it works!

Index: SwordIndex.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/SwordIndex.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SwordIndex.cpp	17 Jan 2004 15:49:42 -0000	1.3
+++ SwordIndex.cpp	17 Jan 2004 19:13:14 -0000	1.4
@@ -69,18 +69,18 @@
 
 		texts=new ModuleMap();
 		__try {
-			//manager=new sword::SWMgr(swordConfigDir,true, new sword::MarkupFilterMgr(sword::FMT_HTMLHREF));
-			//get the available bibles out of here
-			manager=new sword::SWMgr(swordConfigDir,true, 
-				new sword::SWFilterMgr()
-			);
+			manager=new sword::SWMgr(new sword::MarkupFilterMgr(sword::FMT_HTMLHREF));
+			//get the available bibles out of here
+
+//			manager=new sword::SWMgr(swordConfigDir,true, new sword::SWFilterMgr());
+
 
 			sword::ModMap::iterator it;
 			sword::SWModule* curMod = 0;
 			for (it = manager->Modules.begin(); it != manager->Modules.end(); it++) {
 				curMod = (*it).second;
 				if (!strcmp(curMod->Type(), "Biblical Texts")) {
-					curMod->AddStripFilter(new sword::ThMLHTML());
+//					curMod->AddStripFilter(new sword::ThMLHTML());
 					(*texts)[curMod->Name()]=curMod;
 				}
 			}

Index: gui.vcl
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gui.vcl	17 Jan 2004 07:00:31 -0000	1.3
+++ gui.vcl	17 Jan 2004 19:13:14 -0000	1.4
@@ -6,18 +6,21 @@
 --------------------Configuration: gui - Win32 (WCE x86) Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP161.tmp" with contents
+Creating command line "rc.exe /l 0x409 /fo"X86Dbg/BibleReader.res" /i "..\dll1\sword\include" /i "..\dll1\wincesword\include" /d UNDER_CE=300 /d _WIN32_WCE=300 /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "WIN32_PLATFORM_PSPC=310" /d "_X86_" /d "x86" /d "_i386_" /r "D:\src\swordreader\src\gui\BibleReader.rc"" 
+Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP3E.tmp" with contents
 [
 /nologo /W3 /Zi /Od /I "..\STL_eVC" /I "..\..\..\sword\include" /I "..\dll1\wincesword\include" /D "DEBUG" /D "_i386_" /D UNDER_CE=300 /D _WIN32_WCE=300 /D "WIN32_PLATFORM_PSPC=310" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Fp"X86Dbg/gui.pch" /YX /Fo"X86Dbg/" /Fd"X86Dbg/" /Gs8192 /GF /c 
+"D:\src\swordreader\src\gui\ApplicationInterface.cpp"
 "D:\src\swordreader\src\gui\Main.cpp"
 "D:\src\swordreader\src\gui\NavBooks.cpp"
 "D:\src\swordreader\src\gui\Navigator.cpp"
 "D:\src\swordreader\src\gui\NavNumbers.cpp"
 "D:\src\swordreader\src\gui\NavRenderText.cpp"
 "D:\src\swordreader\src\gui\SwordIndex.cpp"
+"D:\src\swordreader\src\gui\Utils.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP161.tmp" 
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP162.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP3E.tmp" 
+Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP3F.tmp" with contents
 [
 corelibc.lib ..\Dll1\X86Dbg\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:yes /pdb:"X86Dbg/gui.pdb" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib /out:"X86Dbg/gui.exe" /subsystem:windowsce,3.00 /MACHINE:IX86 
 .\X86Dbg\ApplicationInterface.obj
@@ -30,9 +33,11 @@
 .\X86Dbg\Utils.obj
 .\X86Dbg\BibleReader.res
 ]
-Creating command line "link.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP162.tmp"
+Creating command line "link.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP3F.tmp"
 <h3>Output Window</h3>
+Compiling resources...
 Compiling...
+ApplicationInterface.cpp
 Main.cpp
 ..\..\..\sword\include\swbuf.h(206) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
 ..\..\..\sword\include\swbuf.h(213) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
@@ -51,6 +56,7 @@
 SwordIndex.cpp
 ..\..\..\sword\include\swbuf.h(206) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
 ..\..\..\sword\include\swbuf.h(213) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
+Utils.cpp
 Linking...