updates for x64

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@754 10f7b99b-c216-0410-bff0-8a66a9350fd8

12 files changed, 22 insertions, 22 deletions

diff --git a/src/ui/CmdUI/CmdUI.vcproj b/src/ui/CmdUI/CmdUI.vcproj
index 1d43b8287..86cac68ae 100644
--- a/src/ui/CmdUI/CmdUI.vcproj
+++ b/src/ui/CmdUI/CmdUI.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/CmdUI/CmdUI_vs2005.vcproj b/src/ui/CmdUI/CmdUI_vs2005.vcproj
index 48ace2963..f7521e828 100644
--- a/src/ui/CmdUI/CmdUI_vs2005.vcproj
+++ b/src/ui/CmdUI/CmdUI_vs2005.vcproj
@@ -100,7 +100,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -215,7 +215,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/LCDUI/LCDUI.vcproj b/src/ui/LCDUI/LCDUI.vcproj
index f3fa83995..0d97f09f1 100644
--- a/src/ui/LCDUI/LCDUI.vcproj
+++ b/src/ui/LCDUI/LCDUI.vcproj
@@ -101,7 +101,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\include"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\include"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/LCDUI/LCDUI_vs2005.vcproj b/src/ui/LCDUI/LCDUI_vs2005.vcproj
index 74795a8e9..9b0a392b8 100644
--- a/src/ui/LCDUI/LCDUI_vs2005.vcproj
+++ b/src/ui/LCDUI/LCDUI_vs2005.vcproj
@@ -100,7 +100,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\include"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -215,7 +215,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\include"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/ResizableLib/ResizableLayout.cpp b/src/ui/ResizableLib/ResizableLayout.cpp
index 15e140ebe..8d7a4d7a9 100644
--- a/src/ui/ResizableLib/ResizableLayout.cpp
+++ b/src/ui/ResizableLib/ResizableLayout.cpp
@@ -273,7 +273,7 @@ void CResizableLayout::EraseBackground(CDC* pDC)
 	else

 	{

 		// take the background brush from the window's class

-#ifdef WIN64

+#ifdef _WIN64

 		hBrush = (HBRUSH)::GetClassLongPtr(hWnd, GCLP_HBRBACKGROUND);

 #else

 		hBrush = (HBRUSH)::GetClassLongPtr(hWnd, GCL_HBRBACKGROUND);

diff --git a/src/ui/ResizableLib/ResizableLib.vcproj b/src/ui/ResizableLib/ResizableLib.vcproj
index 9445a0534..2c7dd5ea5 100644
--- a/src/ui/ResizableLib/ResizableLib.vcproj
+++ b/src/ui/ResizableLib/ResizableLib.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/ResizableLib/ResizableLib_vs2005.vcproj b/src/ui/ResizableLib/ResizableLib_vs2005.vcproj
index 5d4c377da..9a1b73110 100644
--- a/src/ui/ResizableLib/ResizableLib_vs2005.vcproj
+++ b/src/ui/ResizableLib/ResizableLib_vs2005.vcproj
@@ -100,7 +100,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -215,7 +215,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/TreePropSheet/TreePropSheet.vcproj b/src/ui/TreePropSheet/TreePropSheet.vcproj
index 5bf5bbb5f..28a2a840d 100644
--- a/src/ui/TreePropSheet/TreePropSheet.vcproj
+++ b/src/ui/TreePropSheet/TreePropSheet.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/TreePropSheet/TreePropSheet_vs2005.vcproj b/src/ui/TreePropSheet/TreePropSheet_vs2005.vcproj
index a6b122b6d..f6d48b7b9 100644
--- a/src/ui/TreePropSheet/TreePropSheet_vs2005.vcproj
+++ b/src/ui/TreePropSheet/TreePropSheet_vs2005.vcproj
@@ -100,7 +100,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -215,7 +215,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/sizecbar/sizecbar.cpp b/src/ui/sizecbar/sizecbar.cpp
index 6f3a8fb43..8cb8d7157 100644
--- a/src/ui/sizecbar/sizecbar.cpp
+++ b/src/ui/sizecbar/sizecbar.cpp
@@ -532,7 +532,7 @@ void CSizingControlBar::OnNcPaint()
     DrawBorders(&mdc, rcDraw);

 

     // erase the NC background

-#ifdef WIN64

+#ifdef _WIN64

     mdc.FillRect(rcDraw, CBrush::FromHandle(

         (HBRUSH) GetClassLong(m_hWnd, GCLP_HBRBACKGROUND)));

 #else

diff --git a/src/ui/sizecbar/sizecbar.vcproj b/src/ui/sizecbar/sizecbar.vcproj
index 873c7314e..ab907d73a 100644
--- a/src/ui/sizecbar/sizecbar.vcproj
+++ b/src/ui/sizecbar/sizecbar.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/sizecbar/sizecbar_vs2005.vcproj b/src/ui/sizecbar/sizecbar_vs2005.vcproj
index b5c72f72e..4084d1c7a 100644
--- a/src/ui/sizecbar/sizecbar_vs2005.vcproj
+++ b/src/ui/sizecbar/sizecbar_vs2005.vcproj
@@ -100,7 +100,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -215,7 +215,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"