[sword-svn] r129 - in trunk/src: . SwordReader_GUI

dtrotzjr at www.crosswire.org dtrotzjr at www.crosswire.org
Tue May 20 10:16:27 MST 2008


Author: dtrotzjr
Date: 2008-05-20 10:16:27 -0700 (Tue, 20 May 2008)
New Revision: 129

Modified:
   trunk/src/SwRd.vcw
   trunk/src/SwordReader_GUI/SRTextView.cpp
   trunk/src/SwordReader_GUI/SRTextView.h
   trunk/src/SwordReader_GUI/SwordReader_GUI.vcp
Log:
Minor changes required to get a build in eVC and VisualStudio 2005.

Modified: trunk/src/SwRd.vcw
===================================================================
--- trunk/src/SwRd.vcw	2008-05-20 17:15:44 UTC (rev 128)
+++ trunk/src/SwRd.vcw	2008-05-20 17:16:27 UTC (rev 129)
@@ -17,8 +17,7 @@
 
 ###############################################################################
 
-Project: "SwordReader_GUI"=.\SwordReader_GUI\SwordReader_GUI
-.vcp - Package Owner=<4>
+Project: "SwordReader_GUI"=.\SwordReader_GUI\SwordReader_GUI.vcp - Package Owner=<4>
 
 Package=<5>
 {{{

Modified: trunk/src/SwordReader_GUI/SRTextView.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRTextView.cpp	2008-05-20 17:15:44 UTC (rev 128)
+++ trunk/src/SwordReader_GUI/SRTextView.cpp	2008-05-20 17:16:27 UTC (rev 129)
@@ -23,6 +23,8 @@
  */
 #include "SRTextView.h"
 #include "SRFramework/SRApp.h"
+#include <Wingdi.h>
+
 using namespace SRFramework;
 
 BOOL SRTextView::s_fRegistered = false;
@@ -58,7 +60,8 @@
     HFONT hSystemVariableFont = (HFONT ) GetStockObject(SYSTEM_FONT);
     GetObject(hSystemVariableFont, sizeof(LOGFONT), &m_lfCurFont);
     m_lfCurFont.lfHeight = -11;
-    m_lfCurFont.lfQuality = CLEARTYPE_QUALITY;
+	// TODO Detect compiler and determine if we can use CLEARTYPE_QUALITY
+    m_lfCurFont.lfQuality = ANTIALIASED_QUALITY/*CLEARTYPE_QUALITY*/;
     lstrcpy(m_lfCurFont.lfFaceName, _T("Veranda"));
 
     m_lpszBuff = new TCHAR[m_dwBuffSize];

Modified: trunk/src/SwordReader_GUI/SRTextView.h
===================================================================
--- trunk/src/SwordReader_GUI/SRTextView.h	2008-05-20 17:15:44 UTC (rev 128)
+++ trunk/src/SwordReader_GUI/SRTextView.h	2008-05-20 17:16:27 UTC (rev 129)
@@ -153,11 +153,11 @@
     		//! Default Constructor
         SRTextWord();
         //! Copy Constructor
-        SRTextWord(CONST SRTextView::SRTextWord &rhs);
+        SRTextWord(CONST SRTextWord &rhs);
         //! Destructor
         ~SRTextWord();
         //! Assignment operator
-        SRTextView::SRTextWord &operator=(CONST SRTextView::SRTextWord &rhs);
+        SRTextWord &operator=(CONST SRTextWord &rhs);
         //! Clears the contents of this word.
         //! This may include deleting any memory it may own.
         VOID Clear();
@@ -233,11 +233,11 @@
     		//! Default Constructor
         SRTextLines();
         // Copy Constructor
-        SRTextLines(CONST SRTextView::SRTextLines &rhs);
+        SRTextLines(CONST SRTextLines &rhs);
         //! Destructor
         ~SRTextLines();
         //! Assignment operator.
-        SRTextView::SRTextLines &operator=(CONST SRTextView::SRTextLines &rhs);
+        SRTextLines &operator=(CONST SRTextLines &rhs);
 				
 				//! Adds the given word to the end of the line indicated by the line number.
 				/*! If dwLine is larger than the current m_dwLastLine property, then 
@@ -250,7 +250,7 @@
 						@param btWord The SRTextWord object we will copy into the SRTextLines
 						object.
 				*/
-        VOID    AddWordToLine(DWORD dwLine, CONST SRTextView::SRTextWord &btWord);
+        VOID    AddWordToLine(DWORD dwLine, CONST SRTextWord &btWord);
         //! Clears all lines from this instance of SRTextLines. 
         /*! BEWARE - Once this is called the object is not usable again until, 
         		InitLines is called to re-initialize the memory for m_lpLines and 
@@ -436,6 +436,12 @@
     BOOL UpdateWindow();
 
     BOOL Create(SRWnd *pParentWnd, RECT bounds);
+
+	// Friend classes, not needed in Visual Studio 2005
+	// but needed in eVC 3
+	friend class SRTextWord;
+	friend class SRTextLines;
+
 private:
     // Private Methods
     //! Handles the WM_PAINT message for this window control. 

Modified: trunk/src/SwordReader_GUI/SwordReader_GUI.vcp
===================================================================
--- trunk/src/SwordReader_GUI/SwordReader_GUI.vcp	2008-05-20 17:15:44 UTC (rev 128)
+++ trunk/src/SwordReader_GUI/SwordReader_GUI.vcp	2008-05-20 17:16:27 UTC (rev 129)
@@ -175,365 +175,238 @@
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "SRFramework_cpp"
+
+# PROP Default_Filter ".cpp"
 # Begin Source File
 
-SOURCE=..\gui\ApplicationInterface.cpp
+SOURCE=.\SRFramework\SRApp.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_APPLI=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
+DEP_CPP_SRAPP=\
+	".\SRFramework\SRApp.h"\
 	{$(INCLUDE)}"aygshell.h"\
 	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_APPLI=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRAPP=\
+	".\SRFramework\SRApp.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_APPLI=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_APPLI=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRAPP=\
+	".\SRFramework\SRApp.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_APPLI=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_APPLI=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRAPP=\
+	".\SRFramework\SRApp.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_APPLI=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\Main.cpp
+SOURCE=.\SRFramework\SRCommandBar.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Main.h"\
-	"..\gui\Navigator.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
+DEP_CPP_SRCOM=\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
 	{$(INCLUDE)}"aygshell.h"\
-	{$(INCLUDE)}"htmlctrl.h"\
 	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Main.h"\
-	"..\gui\Navigator.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRCOM=\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_MAIN_=\
-	".\ipapi.h"\
-	".\tmlctrl.h"\
-	".\ygshell.h"\
+
+!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
+
+DEP_CPP_SRCOM=\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
+!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
+
+DEP_CPP_SRCOM=\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\SRFramework\SRFrame.cpp
+
+!IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
+
+DEP_CPP_SRFRA=\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	
+
+!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SRFRA=\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	
+
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Main.h"\
-	"..\gui\Navigator.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRFRA=\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
 	
-NODEP_CPP_MAIN_=\
-	".\ipapi.h"\
-	".\tmlctrl.h"\
-	".\ygshell.h"\
+
+!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
+
+DEP_CPP_SRFRA=\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
 	
 
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\SRFramework\SRMenu.cpp
+
+!IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
+
+DEP_CPP_SRMEN=\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\WCString.h"\
+	
+
+!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SRMEN=\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\WCString.h"\
+	
+
+!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
+
+DEP_CPP_SRMEN=\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\WCString.h"\
+	
+
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Main.h"\
-	"..\gui\Navigator.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRMEN=\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\WCString.h"\
 	
-NODEP_CPP_MAIN_=\
-	".\ipapi.h"\
-	".\tmlctrl.h"\
-	".\ygshell.h"\
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\SRFramework\SRWidget.cpp
+
+!IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
+
+DEP_CPP_SRWID=\
+	".\SRFramework\SRWidget.h"\
 	
 
+!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SRWID=\
+	".\SRFramework\SRWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
+
+DEP_CPP_SRWID=\
+	".\SRFramework\SRWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
+
+DEP_CPP_SRWID=\
+	".\SRFramework\SRWidget.h"\
+	
+
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavBooks.cpp
+SOURCE=.\SRFramework\SRWnd.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_NAVBO=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavBooks.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
+DEP_CPP_SRWND=\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NAVBO=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavBooks.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRWND=\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_NAVBO=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavBooks.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRWND=\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_NAVBO=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavBooks.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRWND=\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
 	
 
 !ENDIF 
@@ -541,449 +414,265 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavChap.cpp
+SOURCE=.\SRFramework\WCString.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_NAVCH=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavChap.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
+DEP_CPP_WCSTR=\
+	".\SRFramework\WCString.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NAVCH=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavChap.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_WCSTR=\
+	".\SRFramework\WCString.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_NAVCH=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavChap.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_WCSTR=\
+	".\SRFramework\WCString.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_NAVCH=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\..\..\sword\include\swcacher.h"\
-	"..\..\..\sword\include\swconfig.h"\
-	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
-	"..\..\..\sword\include\swmodule.h"\
-	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
-	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavChap.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_WCSTR=\
+	".\SRFramework\WCString.h"\
 	
 
 !ENDIF 
 
 # End Source File
+# End Group
 # Begin Source File
 
-SOURCE=..\gui\NavFind.cpp
+SOURCE=.\Main.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_NAVFI=\
+DEP_CPP_MAIN_=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRReaderApp.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
 	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"htmlctrl.h"\
 	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NAVFI=\
+DEP_CPP_MAIN_=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRReaderApp.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"htmlctrl.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_NAVFI=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_NAVFI=\
+DEP_CPP_MAIN_=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRReaderApp.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"htmlctrl.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_NAVFI=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_NAVFI=\
+DEP_CPP_MAIN_=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRReaderApp.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"htmlctrl.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_NAVFI=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavNumbers.cpp
+SOURCE=.\SRBookChooser.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_NAVNU=\
+DEP_CPP_SRBOO=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SwordReaderResource.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NAVNU=\
+DEP_CPP_SRBOO=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SwordReaderResource.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_NAVNU=\
+DEP_CPP_SRBOO=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SwordReaderResource.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_NAVNU=\
+DEP_CPP_SRBOO=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SwordReaderResource.h"\
 	
 
 !ENDIF 
@@ -991,317 +680,265 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavRenderText.cpp
+SOURCE=.\SRMainFrame.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_NAVRE=\
+DEP_CPP_SRMAI=\
 	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\encfiltmgr.h"\
 	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\markupfiltmgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavRenderText.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
-	"..\gui\WCString.h"\
+	"..\dll1\wincesword\include\swordce.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
 	{$(INCLUDE)}"aygshell.h"\
 	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NAVRE=\
+DEP_CPP_SRMAI=\
 	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\encfiltmgr.h"\
 	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\markupfiltmgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavRenderText.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
+	"..\dll1\wincesword\include\swordce.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_NAVRE=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_NAVRE=\
+DEP_CPP_SRMAI=\
 	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\encfiltmgr.h"\
 	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\markupfiltmgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavRenderText.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
+	"..\dll1\wincesword\include\swordce.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_NAVRE=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_NAVRE=\
+DEP_CPP_SRMAI=\
 	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\encfiltmgr.h"\
 	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\markupfiltmgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavRenderText.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
+	"..\dll1\wincesword\include\swordce.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_NAVRE=\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavVerse.cpp
+SOURCE=.\SRMenuBar.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_NAVVE=\
+DEP_CPP_SRMENU=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavVerse.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMenuBar.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NAVVE=\
+DEP_CPP_SRMENU=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavVerse.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMenuBar.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_NAVVE=\
+DEP_CPP_SRMENU=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavVerse.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMenuBar.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_NAVVE=\
+DEP_CPP_SRMENU=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavVerse.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMenuBar.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ENDIF 
@@ -1309,175 +946,86 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\SimpleNavigator.cpp
+SOURCE=.\SRNumberChooser.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_SIMPL=\
+DEP_CPP_SRNUM=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\url.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavBooks.h"\
-	"..\gui\NavChap.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavRenderText.h"\
-	"..\gui\NavVerse.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
-	"..\gui\WCString.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRNumberChooser.h"\
+	".\SwordReaderResource.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SIMPL=\
+DEP_CPP_SRNUM=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\url.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavBooks.h"\
-	"..\gui\NavChap.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavRenderText.h"\
-	"..\gui\NavVerse.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRNumberChooser.h"\
+	".\SwordReaderResource.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_SIMPL=\
+DEP_CPP_SRNUM=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\url.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavBooks.h"\
-	"..\gui\NavChap.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavRenderText.h"\
-	"..\gui\NavVerse.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRNumberChooser.h"\
+	".\SwordReaderResource.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_SIMPL=\
+DEP_CPP_SRNUM=\
 	"..\..\..\sword\include\defs.h"\
 	"..\..\..\sword\include\listkey.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swmacs.h"\
-	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
-	"..\..\..\sword\include\url.h"\
-	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\NavBooks.h"\
-	"..\gui\NavChap.h"\
-	"..\gui\NavFind.h"\
-	"..\gui\NavNumbers.h"\
-	"..\gui\NavPage.h"\
-	"..\gui\NavRenderText.h"\
-	"..\gui\NavVerse.h"\
-	"..\gui\SimpleNavigator.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRNumberChooser.h"\
+	".\SwordReaderResource.h"\
 	
 
 !ENDIF 
@@ -1485,151 +1033,142 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\SwordIndex.cpp
+SOURCE=.\SRReaderApp.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_SWORD=\
+DEP_CPP_SRREA=\
 	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\encfiltmgr.h"\
 	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\markupfiltmgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\Dll1\winceSword\include\swwinlog.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRReaderApp.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SWORD=\
+DEP_CPP_SRREA=\
 	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\encfiltmgr.h"\
 	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\markupfiltmgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\Dll1\winceSword\include\swwinlog.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRReaderApp.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_SWORD=\
+DEP_CPP_SRREA=\
 	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\encfiltmgr.h"\
 	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\markupfiltmgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\Dll1\winceSword\include\swwinlog.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRReaderApp.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_SWORD=\
+DEP_CPP_SRREA=\
 	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\encfiltmgr.h"\
 	"..\..\..\sword\include\listkey.h"\
-	"..\..\..\sword\include\markupfiltmgr.h"\
 	"..\..\..\sword\include\multimapwdef.h"\
-	"..\..\..\sword\include\swbasicfilter.h"\
 	"..\..\..\sword\include\swbuf.h"\
 	"..\..\..\sword\include\swcacher.h"\
 	"..\..\..\sword\include\swconfig.h"\
 	"..\..\..\sword\include\swdisp.h"\
-	"..\..\..\sword\include\swfilter.h"\
-	"..\..\..\sword\include\swfiltermgr.h"\
 	"..\..\..\sword\include\swkey.h"\
-	"..\..\..\sword\include\swlog.h"\
 	"..\..\..\sword\include\swmacs.h"\
 	"..\..\..\sword\include\swmgr.h"\
 	"..\..\..\sword\include\swmodule.h"\
 	"..\..\..\sword\include\swobject.h"\
-	"..\..\..\sword\include\swoptfilter.h"\
 	"..\..\..\sword\include\swsearchable.h"\
-	"..\..\..\sword\include\swtext.h"\
-	"..\..\..\sword\include\thmlhtml.h"\
-	"..\..\..\sword\include\thmlvariants.h"\
 	"..\..\..\sword\include\versekey.h"\
-	"..\..\..\sword\include\ztext.h"\
-	"..\..\..\sword\include\zverse.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\Dll1\winceSword\include\swwinlog.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\SwordIndex.h"\
-	"..\gui\Utils.h"\
+	".\SRBookChooser.h"\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRCommandBar.h"\
+	".\SRFramework\SRFrame.h"\
+	".\SRFramework\SRMenu.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRMainFrame.h"\
+	".\SRMenuBar.h"\
+	".\SRNumberChooser.h"\
+	".\SRReaderApp.h"\
+	".\SRTextView.h"\
+	".\SwordReaderResource.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ENDIF 
@@ -1637,270 +1176,122 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\TextControl.cpp
+SOURCE=.\SRTextView.cpp
 
 !IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
 
-DEP_CPP_TEXTC=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
-	{$(INCLUDE)}"htmlctrl.h"\
+DEP_CPP_SRTEX=\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRTextView.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
 
-DEP_CPP_TEXTC=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRTEX=\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRTextView.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_TEXTC=\
-	".\tmlctrl.h"\
-	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
 
-DEP_CPP_TEXTC=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRTEX=\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRTextView.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_TEXTC=\
-	".\tmlctrl.h"\
-	
 
 !ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
 
-DEP_CPP_TEXTC=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
+DEP_CPP_SRTEX=\
+	".\SRFramework\SRApp.h"\
+	".\SRFramework\SRWnd.h"\
+	".\SRFramework\WCString.h"\
+	".\SRTextView.h"\
+	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_TEXTC=\
-	".\tmlctrl.h"\
-	
 
 !ENDIF 
 
 # End Source File
-# Begin Source File
-
-SOURCE=..\gui\Utils.cpp
-
-!IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
-
-DEP_CPP_UTILS=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Utils.h"\
-	"..\gui\WCString.h"\
-	
-
-!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
-
-DEP_CPP_UTILS=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Utils.h"\
-	
-
-!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
-
-DEP_CPP_UTILS=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Utils.h"\
-	
-
-!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
-
-DEP_CPP_UTILS=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\Utils.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\gui\VerseTextControl.cpp
-
-!IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
-
-DEP_CPP_VERSE=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
-	"..\gui\WCString.h"\
-	{$(INCLUDE)}"htmlctrl.h"\
-	
-
-!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
-
-DEP_CPP_VERSE=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
-	
-NODEP_CPP_VERSE=\
-	".\tmlctrl.h"\
-	
-
-!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
-
-DEP_CPP_VERSE=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
-	
-NODEP_CPP_VERSE=\
-	".\tmlctrl.h"\
-	
-
-!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
-
-DEP_CPP_VERSE=\
-	"..\..\..\sword\include\defs.h"\
-	"..\..\..\sword\include\swbuf.h"\
-	"..\Dll1\winceSword\include\swordce.h"\
-	"..\gui\ApplicationInterface.h"\
-	"..\gui\TextControl.h"\
-	"..\gui\Utils.h"\
-	"..\gui\VerseTextControl.h"\
-	
-NODEP_CPP_VERSE=\
-	".\tmlctrl.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\gui\WCString.cpp
-
-!IF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Release"
-
-DEP_CPP_WCSTR=\
-	"..\gui\WCString.h"\
-	
-
-!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE ARM) Debug"
-
-DEP_CPP_WCSTR=\
-	"..\gui\WCString.h"\
-	
-
-!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Release"
-
-DEP_CPP_WCSTR=\
-	"..\gui\WCString.h"\
-	
-
-!ELSEIF  "$(CFG)" == "SwordReader_GUI - Win32 (WCE x86) Debug"
-
-DEP_CPP_WCSTR=\
-	"..\gui\WCString.h"\
-	
-
-!ENDIF 
-
-# End Source File
 # End Group
 # Begin Group "Header Files"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "SRFramework_h"
+
+# PROP Default_Filter ".h"
 # Begin Source File
 
-SOURCE=..\gui\ApplicationInterface.h
+SOURCE=.\SRFramework\SRApp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\Main.h
+SOURCE=.\SRFramework\SRCommandBar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavBooks.h
+SOURCE=.\SRFramework\SRFrame.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavChap.h
+SOURCE=.\SRFramework\SRMenu.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavFind.h
+SOURCE=.\SRFramework\SRWidget.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavNumbers.h
+SOURCE=.\SRFramework\SRWnd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavPage.h
+SOURCE=.\SRFramework\WCString.h
 # End Source File
+# End Group
 # Begin Source File
 
-SOURCE=..\gui\NavRenderText.h
+SOURCE=.\resource.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\NavVerse.h
+SOURCE=.\SRBookChooser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\SimpleNavigator.h
+SOURCE=.\SRMainFrame.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\SwordIndex.h
+SOURCE=.\SRMenuBar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\TextControl.h
+SOURCE=.\SRNumberChooser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\Utils.h
+SOURCE=.\SRReaderApp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\VerseTextControl.h
+SOURCE=.\SRTextView.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\WCString.h
+SOURCE=.\SwordReaderResource.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"




More information about the sword-cvs mailing list