[sword-cvs] swordreader/src/gui NavRenderText.cpp,1.3,1.4 gui.vcl,1.8,1.9
sword@www.crosswire.org
sword@www.crosswire.org
Wed, 21 Jan 2004 12:52:27 -0700
Update of /cvs/core/swordreader/src/gui
In directory www:/tmp/cvs-serv29490/src/gui
Modified Files:
NavRenderText.cpp gui.vcl
Log Message:
no message
Index: NavRenderText.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavRenderText.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NavRenderText.cpp 18 Jan 2004 01:03:23 -0000 1.3
+++ NavRenderText.cpp 21 Jan 2004 19:52:25 -0000 1.4
@@ -72,7 +72,7 @@
void NavRenderText::load() {
#ifdef debugfile
- file=_fopen("\\chapter.html","w+");
+ file=fopen("\\chapter.html","w+");
#endif
navigator->position.setMark();
navigator->position.setVerse(1);
@@ -80,7 +80,10 @@
currentChapter=navigator->position.getChap();
UString text = L"";
// text += L"<?xml version=\"1.0\" encoding=\"UTF-16\"?><!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">";
-// text += L"<html><head><title>c</title><style type=\"text/css\">small:{display:none}</style></head><body>";
+ text += L"<html><head><title>c</title>";
+ text += L"<style type=\"text/css\">small:{display:none}";
+// text += L"html, body {Font-family: code2000;}";
+ text += L"</style></head><body>";
UString s;
UString heading;
while (true) {
@@ -95,13 +98,13 @@
else
navigator->position.next();
}
-// text += L"</body></html>";
+ text += L"</body></html>";
__try {
addHtml(htmlControl, text.c_str());
}
__except(EXCEPTION_EXECUTE_HANDLER) {
- addHtml(htmlControl,"Not enough memory available");
+ addHtml(htmlControl,L"Not enough memory available");
}
navigator->position.jumpBack();
Index: gui.vcl
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gui.vcl 21 Jan 2004 08:02:39 -0000 1.8
+++ gui.vcl 21 Jan 2004 19:52:25 -0000 1.9
@@ -6,21 +6,13 @@
--------------------Configuration: gui - Win32 (WCE ARM) Release--------------------
</h3>
<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"ARMRel/BibleReader.res" /i "..\dll1\sword\include" /i "..\dll1\wincesword\include" /i "..\STL_eVC" /d UNDER_CE=300 /d _WIN32_WCE=300 /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "WIN32_PLATFORM_PSPC=310" /d "ARM" /d "_ARM_" /r "D:\src\swordreader\src\gui\BibleReader.rc""
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSPBB.tmp" with contents
+Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP4A.tmp" with contents
[
/nologo /W3 /I "..\STL_eVC" /I "..\..\..\sword\include" /I "..\dll1\wincesword\include" /D _WIN32_WCE=300 /D "WIN32_PLATFORM_PSPC=310" /D "ARM" /D "_ARM_" /D UNDER_CE=300 /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Fp"ARMRel/gui.pch" /YX /Fo"ARMRel/" /Oxs /MC /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 "clarm.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSPBB.tmp"
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSPBC.tmp" with contents
+Creating command line "clarm.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP4A.tmp"
+Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP4B.tmp" with contents
[
..\Dll1\ARMRel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib ..\Dll1\ARMRel\sword.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:no /pdb:"ARMRel/gui.pdb" /nodefaultlib:"libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib" /out:"ARMRel/gui.exe" /libpath:"..\STL_eVC" /libpath:"C:\IpaqProgs\SwordReader\src\STL_eVC\\" /subsystem:windowsce,3.00 /align:"4096" /MACHINE:ARM
.\ARMRel\ApplicationInterface.obj
@@ -33,43 +25,23 @@
.\ARMRel\Utils.obj
.\ARMRel\BibleReader.res
]
-Creating command line "link.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSPBC.tmp"
+Creating command line "link.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP4B.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)
-NavBooks.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)
-Navigator.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)
-NavNumbers.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)
NavRenderText.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)
-D:\src\swordreader\src\gui\NavRenderText.cpp(112) : warning C4509: nonstandard extension used: 'load' uses SEH and 'heading' has destructor
- D:\src\swordreader\src\gui\NavRenderText.cpp(85) : see declaration of 'heading'
-D:\src\swordreader\src\gui\NavRenderText.cpp(112) : warning C4509: nonstandard extension used: 'load' uses SEH and 's' has destructor
- D:\src\swordreader\src\gui\NavRenderText.cpp(84) : see declaration of 's'
-D:\src\swordreader\src\gui\NavRenderText.cpp(112) : warning C4509: nonstandard extension used: 'load' uses SEH and 'text' has destructor
+D:\src\swordreader\src\gui\NavRenderText.cpp(115) : warning C4509: nonstandard extension used: 'load' uses SEH and 'heading' has destructor
+ D:\src\swordreader\src\gui\NavRenderText.cpp(88) : see declaration of 'heading'
+D:\src\swordreader\src\gui\NavRenderText.cpp(115) : warning C4509: nonstandard extension used: 'load' uses SEH and 's' has destructor
+ D:\src\swordreader\src\gui\NavRenderText.cpp(87) : see declaration of 's'
+D:\src\swordreader\src\gui\NavRenderText.cpp(115) : warning C4509: nonstandard extension used: 'load' uses SEH and 'text' has destructor
D:\src\swordreader\src\gui\NavRenderText.cpp(81) : see declaration of 'text'
-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...
<h3>Results</h3>
-gui.exe - 0 error(s), 15 warning(s)
+gui.exe - 0 error(s), 3 warning(s)
</pre>
</body>
</html>