From 28b04878cef492e8b3925e4ea804c9523cf25c1d Mon Sep 17 00:00:00 2001
From: Scott Ehlert <ds@alliedmods.net>
Date: Fri, 14 Apr 2006 15:55:25 +0000
Subject: [PATCH] Added visual style support :o

---
 dlls/csx/source/WinCSX/Resource.h          |   6 +-
 dlls/csx/source/WinCSX/WinCSX.exe.manifest |   8 ++
 dlls/csx/source/WinCSX/WinCSX.rc           | 108 ++++++++++-----------
 dlls/csx/source/WinCSX/WinCSX.vcproj       |   3 +
 dlls/csx/source/WinCSX/msvc8/WinCSX.vcproj |   4 +
 5 files changed, 68 insertions(+), 61 deletions(-)
 create mode 100644 dlls/csx/source/WinCSX/WinCSX.exe.manifest

diff --git a/dlls/csx/source/WinCSX/Resource.h b/dlls/csx/source/WinCSX/Resource.h
index 8fec3fcb..c197fc36 100755
--- a/dlls/csx/source/WinCSX/Resource.h
+++ b/dlls/csx/source/WinCSX/Resource.h
@@ -3,16 +3,17 @@
 // Used by WinCSX.rc
 //
 #define IDC_MYICON                      2
+#define IDM_VISUALSTYLES                1
 #define IDD_WINCSX_DIALOG               102
 #define IDS_APP_TITLE                   103
 #define IDD_WINCSXBOX                   103
 #define IDM_ABOUT                       104
-#define IDM_EXIT                        105
 #define IDI_WINCSX                      107
 #define IDI_SMALL                       108
 #define IDC_WINCSX                      109
 #define IDR_MAINFRAME                   128
 #define IDD_ABOUTBOX                    129
+#define IDR_241                         132
 #define IDC_LIST                        1010
 #define IDC_BUTTON_ABOUT                1029
 #define IDC_ABOUT                       1029
@@ -36,7 +37,6 @@
 #define IDC_AUTHOR                      1114
 #define ID_HELP_DIALOG                  32771
 #define IDM_FILE_DIALOG                 32773
-#define IDM_WINCSX                      32774
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -44,7 +44,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        131
+#define _APS_NEXT_RESOURCE_VALUE        133
 #define _APS_NEXT_COMMAND_VALUE         32775
 #define _APS_NEXT_CONTROL_VALUE         1033
 #define _APS_NEXT_SYMED_VALUE           110
diff --git a/dlls/csx/source/WinCSX/WinCSX.exe.manifest b/dlls/csx/source/WinCSX/WinCSX.exe.manifest
new file mode 100644
index 00000000..a487475e
--- /dev/null
+++ b/dlls/csx/source/WinCSX/WinCSX.exe.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="x86" />
+		</dependentAssembly>
+	</dependency>
+</assembly>
\ No newline at end of file
diff --git a/dlls/csx/source/WinCSX/WinCSX.rc b/dlls/csx/source/WinCSX/WinCSX.rc
index 3b6528c4..dfe326dd 100755
--- a/dlls/csx/source/WinCSX/WinCSX.rc
+++ b/dlls/csx/source/WinCSX/WinCSX.rc
@@ -15,11 +15,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Swedish resources
+// Neutral resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 #ifdef _WIN32
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -33,33 +33,6 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 IDI_WINCSX              ICON                    "WinCSX.ico"
 IDI_SMALL               ICON                    "small.ico"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDC_WINCSX MENU 
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "WinCSX",                      IDM_WINCSX
-        MENUITEM "E&xit",                       IDM_EXIT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDC_WINCSX ACCELERATORS 
-BEGIN
-    "?",            IDM_ABOUT,              ASCII,  ALT
-    "/",            IDM_ABOUT,              ASCII,  ALT
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -123,34 +96,6 @@ BEGIN
 END
 
 
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""windows.h""\r\n"
-    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -188,6 +133,13 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// 24
+//
+
+IDM_VISUALSTYLES        24                      "WinCSX.exe.manifest"
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
@@ -199,6 +151,46 @@ BEGIN
     IDC_WINCSX              "WINCSX"
 END
 
+#endif    // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Swedish resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
+#ifdef _WIN32
+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
 #endif    // Swedish resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/dlls/csx/source/WinCSX/WinCSX.vcproj b/dlls/csx/source/WinCSX/WinCSX.vcproj
index a547212d..3198f30f 100755
--- a/dlls/csx/source/WinCSX/WinCSX.vcproj
+++ b/dlls/csx/source/WinCSX/WinCSX.vcproj
@@ -153,6 +153,9 @@
 			<File
 				RelativePath=".\small.ico">
 			</File>
+			<File
+				RelativePath=".\WinCSX.exe.manifest">
+			</File>
 			<File
 				RelativePath=".\WinCSX.ico">
 			</File>
diff --git a/dlls/csx/source/WinCSX/msvc8/WinCSX.vcproj b/dlls/csx/source/WinCSX/msvc8/WinCSX.vcproj
index aee19794..16fd1a4f 100644
--- a/dlls/csx/source/WinCSX/msvc8/WinCSX.vcproj
+++ b/dlls/csx/source/WinCSX/msvc8/WinCSX.vcproj
@@ -230,6 +230,10 @@
 				RelativePath="..\small.ico"
 				>
 			</File>
+			<File
+				RelativePath="..\WinCSX.exe.manifest"
+				>
+			</File>
 			<File
 				RelativePath="..\WinCSX.ico"
 				>