[sword-svn] r114 - trunk/src/SwordReader_GUI

[dtrotzjr at www.crosswire.org]

Author: dtrotzjr
Date: 2008-04-12 16:38:02 -0700 (Sat, 12 Apr 2008)
New Revision: 114

Modified:
   trunk/src/SwordReader_GUI/Main.cpp
   trunk/src/SwordReader_GUI/SwordIndex.cpp
   trunk/src/SwordReader_GUI/SwordIndex.h
   trunk/src/SwordReader_GUI/SwordReaderApp.h
   trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
Log:
Minor changes, just moving over to my laptop.

Modified: trunk/src/SwordReader_GUI/Main.cpp
===================================================================
--- trunk/src/SwordReader_GUI/Main.cpp	2008-04-07 00:08:33 UTC (rev 113)
+++ trunk/src/SwordReader_GUI/Main.cpp	2008-04-12 23:38:02 UTC (rev 114)
@@ -9,17 +9,15 @@
 					LPTSTR    lpCmdLine,
 					int       nCmdShow)
 {
-    SwordReaderApp *app = new SwordReaderApp();
+    SwordReaderApp *app = new SwordReaderApp(hInstance);
 	MSG msg;
 
 	HCURSOR hOldCursor = SetCursor(LoadCursor(NULL, IDC_WAIT));
-	if (!app->InitApp(hInstance, nCmdShow)) 
+	if (!app->InitApp(nCmdShow)) 
 		return FALSE; // Either it failed, or it's already loaded...
 	SetCursor(hOldCursor);
 	
     return app->Run();
 }
 
-namespace sword {
-	char *SWBuf::nullStr = "";
-}
+

Modified: trunk/src/SwordReader_GUI/SwordIndex.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SwordIndex.cpp	2008-04-07 00:08:33 UTC (rev 113)
+++ trunk/src/SwordReader_GUI/SwordIndex.cpp	2008-04-12 23:38:02 UTC (rev 114)
@@ -1,9 +1,10 @@
-#include "ApplicationInterface.h"
 #include "SwordIndex.h"
-#include <markupfiltmgr.h>
-#include <swordce.h>
-#include "swwinlog.h"
 
+
+namespace sword {
+	char *SWBuf::nullStr = "";
+}
+
 const CHAR* swordConfigDir="/Program Files/sword/books";
 
 TCHAR* defBookNames[66]={
@@ -244,4 +245,4 @@
     Searcher *caller = static_cast<Searcher*>(userData);
     if(caller)
         caller->setProgress((int)percent);
-}
\ No newline at end of file
+}

Modified: trunk/src/SwordReader_GUI/SwordIndex.h
===================================================================
--- trunk/src/SwordReader_GUI/SwordIndex.h	2008-04-07 00:08:33 UTC (rev 113)
+++ trunk/src/SwordReader_GUI/SwordIndex.h	2008-04-12 23:38:02 UTC (rev 114)
@@ -5,18 +5,18 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "resource.h"
-#include "utils.h"
-#include "WCString.h"
 #include <versekey.h>
 #include <ztext.h>
 #include <swmgr.h>
 #include <swconfig.h>
-//#include <thmlplain.h>
 #include <thmlhtml.h>
 #include <thmlvariants.h>
+#include <markupfiltmgr.h>
 
+#include "SRFramework/WCString.h"
+
 using namespace sword;
+using namespace SRFramework;
 
 struct ltstr
 {
@@ -117,4 +117,6 @@
 };
 
 void setPercentCB(char percent, void *userData);
+
+
 #endif

Modified: trunk/src/SwordReader_GUI/SwordReaderApp.h
===================================================================
--- trunk/src/SwordReader_GUI/SwordReaderApp.h	2008-04-07 00:08:33 UTC (rev 113)
+++ trunk/src/SwordReader_GUI/SwordReaderApp.h	2008-04-12 23:38:02 UTC (rev 114)
@@ -3,7 +3,7 @@
 #include "SimpleNavigator.h"
 #include "SRFramework/SRApp.h"
 #include "SRMainFrame.h"
-#include "ApplicationInterface.h"
+//#include "ApplicationInterface.h"
 
 //#include "swordce.h"
 using namespace SRFramework;

Modified: trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
===================================================================
--- trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj	2008-04-07 00:08:33 UTC (rev 113)
+++ trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj	2008-04-12 23:38:02 UTC (rev 114)
@@ -783,6 +783,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
 				RelativePath=".\SimpleNavigator.h"
 				>
 			</File>