Remove accelerators; we do them by hand now.

stepmania/src/StepMania.RC

@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE MOVEABLE PURE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE MOVEABLE PURE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE MOVEABLE PURE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
@@ -47,20 +47,6 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDR_MAIN_ACCEL ACCELERATORS MOVEABLE PURE 
-BEGIN
-    VK_F5,          IDM_CHANGEDETAIL,       VIRTKEY, NOINVERT
-    "X",            IDM_EXIT,               VIRTKEY, ALT, NOINVERT
-    VK_F4,          IDM_TOGGLEFULLSCREEN,   VIRTKEY, NOINVERT
-    VK_RETURN,      IDM_TOGGLEFULLSCREEN,   VIRTKEY, ALT, NOINVERT
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -68,9 +54,8 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON                ICON    DISCARDABLE     "StepMania.ICO"
+IDI_ICON                ICON                    "StepMania.ICO"
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -93,14 +78,14 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "http://www.stepmania.com\0"
-            VALUE "FileDescription", "StepMania\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "StepMania\0"
-            VALUE "LegalCopyright", "Copyright © 2001-2002\0"
-            VALUE "OriginalFilename", "StepMania.exe\0"
-            VALUE "ProductName", "  StepMania\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "CompanyName", "http://www.stepmania.com"
+            VALUE "FileDescription", "StepMania"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "StepMania"
+            VALUE "LegalCopyright", "Copyright © 2001-2002"
+            VALUE "OriginalFilename", "StepMania.exe"
+            VALUE "ProductName", "  StepMania"
+            VALUE "ProductVersion", "1, 0, 0, 1"
         END
     END
     BLOCK "VarFileInfo"
@@ -109,25 +94,23 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
 //
 
-BITMAP_ERROR            BITMAP  MOVEABLE PURE   "error.bmp"
-BITMAP_LOADING          BITMAP  MOVEABLE PURE   "loading.bmp"
-BITMAP_CRASH            BITMAP  MOVEABLE PURE   "error2.bmp"
+BITMAP_ERROR            BITMAP                  "error.bmp"
+BITMAP_LOADING          BITMAP                  "loading.bmp"
+BITMAP_CRASH            BITMAP                  "error2.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
-IDD_ERROR_DIALOG DIALOG DISCARDABLE  0, 0, 332, 234
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+IDD_ERROR_DIALOG DIALOG  0, 0, 332, 234
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "StepMania Error"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -142,8 +125,8 @@ BEGIN
     PUSHBUTTON      "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15
 END
 
-IDD_LOADING_DIALOG DIALOG DISCARDABLE  0, 0, 312, 78
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
+IDD_LOADING_DIALOG DIALOG  0, 0, 312, 78
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         117,IDC_STATIC,"Static",SS_BITMAP,0,0,312,38
@@ -153,7 +136,7 @@ BEGIN
 END
 
 IDD_DISASM_CRASH DIALOGEX 0, 0, 399, 286
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "StepMania Error"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
@@ -188,7 +171,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO MOVEABLE PURE 
+GUIDELINES DESIGNINFO 
 BEGIN
     IDD_LOADING_DIALOG, DIALOG
     BEGIN

stepmania/src/resource.h

@@ -1,5 +1,5 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
 // Used by StepMania.RC
 //
 #define IDC_CRASH_SAVE                  16
@@ -10,7 +10,6 @@
 #define BITMAP_ERROR                    129
 #define IDD_DISASM_CRASH                199
 #define IDC_SHOCKWAVEFLASH1             1000
-#define IDR_MAIN_ACCEL                  1001
 #define IDC_BUTTON_RESTART              1001
 #define IDM_TOGGLEFULLSCREEN            1002
 #define IDC_BUTTON_REPORT               1002