[sword-svn] r179 - in trunk/src: Dll1 SwordReader_GUI

[dtrotzjr at www.crosswire.org]

Author: dtrotzjr
Date: 2008-09-13 09:31:31 -0700 (Sat, 13 Sep 2008)
New Revision: 179

Modified:
   trunk/src/Dll1/Dll1.vcproj
   trunk/src/SwordReader_GUI/SRMainFrame.cpp
   trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
Log:
Fixed minor memory leak

Modified: trunk/src/Dll1/Dll1.vcproj
===================================================================
--- trunk/src/Dll1/Dll1.vcproj	2008-09-13 03:22:28 UTC (rev 178)
+++ trunk/src/Dll1/Dll1.vcproj	2008-09-13 16:31:31 UTC (rev 179)
@@ -296,6 +296,7 @@
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/sword.pdb"
 				StackReserveSize="65536"
 				StackCommitSize="4096"
@@ -322,7 +323,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory=""
+				RemoteDirectory="\Storage Card\Program Files\sword\"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>

Modified: trunk/src/SwordReader_GUI/SRMainFrame.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRMainFrame.cpp	2008-09-13 03:22:28 UTC (rev 178)
+++ trunk/src/SwordReader_GUI/SRMainFrame.cpp	2008-09-13 16:31:31 UTC (rev 179)
@@ -85,6 +85,8 @@
         delete m_modDicts;
     if(m_menuBar)
         delete m_menuBar;
+    if(m_tabViews)
+        delete m_tabViews;
 }
 
 BOOL SRMainFrame::Register()
@@ -544,10 +546,11 @@
     m_tabViews->ManualChangeCurrentTab(nLastTab);
     verse = new VerseKey((*m_confOptions)["History"].getWithDefault("LastBiblePassage", "Gen 1:1"));
     m_tabViews->SetBibleKey(*verse);
+    delete verse;
     verse = new VerseKey((*m_confOptions)["History"].getWithDefault("LastCommPassage", "Gen 1:1"));
     m_tabViews->SetCommKey(*verse);
+    delete verse;
     
-    delete verse;
 }
 
 void SRMainFrame::SetWindowTitle(const WCString &wcsTitle)

Modified: trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
===================================================================
--- trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj	2008-09-13 03:22:28 UTC (rev 178)
+++ trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj	2008-09-13 16:31:31 UTC (rev 179)
@@ -274,6 +274,7 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
@@ -684,13 +685,15 @@
 				AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
 				PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
 				RuntimeLibrary="1"
+				RuntimeTypeInfo="true"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
+				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -715,6 +718,8 @@
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
+				GenerateMapFile="true"
+				MapExports="true"
 				StackReserveSize="65536"
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
@@ -739,9 +744,9 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory=""
+				RemoteDirectory="\Storage Card\Program Files\sword\"
 				RegisterOutput="0"
-				AdditionalFiles=""
+				AdditionalFiles="../../sword.dll"
 			/>
 			<DebuggerTool
 			/>