From 99092eb2616a5e88144f64f56dd01c53c50e9563 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Mon, 6 Jul 2009 10:41:04 +0000
Subject: 

---
 Horloge/Horloge.vcproj | 31 ++++++++++++++-----------------
 Horloge/HorlogeDlg.cpp |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'Horloge')

diff --git a/Horloge/Horloge.vcproj b/Horloge/Horloge.vcproj
index 9c9c9cd..83d018b 100644
--- a/Horloge/Horloge.vcproj
+++ b/Horloge/Horloge.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="Horloge"
 	ProjectGUID="{79A52956-E5E0-46FF-9EB7-112ED0CD5315}"
 	RootNamespace="Horloge"
@@ -9,6 +9,7 @@
 	SccLocalPath="."
 	SccProvider="MSSCCI:Microsoft Visual SourceSafe"
 	Keyword="MFCProj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -54,7 +55,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.5&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -82,6 +83,8 @@
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				Profile="true"
 			/>
 			<Tool
@@ -103,9 +106,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -142,7 +142,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.5&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -171,6 +171,8 @@
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="17"
 				Profile="true"
 			/>
@@ -193,9 +195,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -232,7 +231,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.5&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -258,6 +257,8 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -278,9 +279,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="rem copy &quot;$(TargetPath)&quot; &quot;C:\users\fcolin\Program Files\$(OutDir)&quot;"
 			/>
@@ -318,7 +316,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-6.4&quot;"
+				AdditionalIncludeDirectories="..\Ivy;&quot;..\..\..\pcre-7.5&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -344,6 +342,8 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -365,9 +365,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="rem copy &quot;$(TargetPath)&quot; &quot;C:\users\fcolin\Program Files\$(OutDir)&quot;"
 			/>
diff --git a/Horloge/HorlogeDlg.cpp b/Horloge/HorlogeDlg.cpp
index b6ac3d9..5ec075a 100644
--- a/Horloge/HorlogeDlg.cpp
+++ b/Horloge/HorlogeDlg.cpp
@@ -338,7 +338,7 @@ void CHorlogeDlg::OnForw5()
 
 void CHorlogeDlg::OnFile() 
 {
-	CFileDialog  file(TRUE,TEXT(".rej"),NULL, OFN_FILEMUSTEXIST,TEXT("Rejeu Files (*.rej)|*.rej|All Files (*.*)|*.*||"));	
+	CFileDialog  file(TRUE,TEXT(".rej"),NULL, OFN_FILEMUSTEXIST,TEXT("Rejeu Files (*.rej;*.txt)|*.rej; *.txt|All Files (*.*)|*.*||"));	
 	if ( file.DoModal() == IDOK )
 	{
 	bus->SendMsg( "FileRead Type=rejeu Name=%S", file.GetPathName() );
-- 
cgit v1.1