From 0df58830abcb462a2abf388a127369d66dc3f807 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 7 Jul 2003 02:49:35 +0000 Subject: [PATCH] remove unused, empty dialogs --- stepmania/src/StepMania.RC | 255 +++++++++++++------------------------ stepmania/src/resource.h | 4 +- 2 files changed, 92 insertions(+), 167 deletions(-) diff --git a/stepmania/src/StepMania.RC b/stepmania/src/StepMania.RC index 0658bb7a4f..09617e9568 100644 --- a/stepmania/src/StepMania.RC +++ b/stepmania/src/StepMania.RC @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -12,76 +12,6 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// Japanese resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) -#ifdef _WIN32 -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(932) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 187, 93 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 9, "‚l‚r ‚oƒSƒVƒbƒN" -BEGIN - DEFPUSHBUTTON "OK",IDOK,130,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,130,24,50,14 -END - -IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 93 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 9, "‚l‚r ‚oƒSƒVƒbƒN" -BEGIN - DEFPUSHBUTTON "OK",IDOK,130,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,130,24,50,14 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 180 - TOPMARGIN, 7 - BOTTOMMARGIN, 86 - END - - IDD_DIALOG2, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 180 - TOPMARGIN, 7 - BOTTOMMARGIN, 86 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -//IDC_CURSOR1 CURSOR DISCARDABLE "cursor1.cur" -#endif // Japanese resources -///////////////////////////////////////////////////////////////////////////// - - ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -91,99 +21,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE MOVEABLE PURE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE MOVEABLE PURE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE MOVEABLE PURE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON ICON DISCARDABLE "StepMania.ICO" - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - 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" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - 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" - ///////////////////////////////////////////////////////////////////////////// // // 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 @@ -198,8 +42,8 @@ BEGIN IDC_STATIC,7,46,298,28 END -IDD_LOADING_DIALOG DIALOG DISCARDABLE 0, 0, 312, 82 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE +IDD_LOADING_DIALOG DIALOG 0, 0, 312, 82 +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 @@ -208,8 +52,8 @@ BEGIN CTEXT "line3",IDC_STATIC_MESSAGE3,0,65,310,10,SS_CENTERIMAGE END -IDD_DISASM_CRASH DIALOG DISCARDABLE 0, 0, 399, 271 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +IDD_DISASM_CRASH DIALOG 0, 0, 399, 271 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "StepMania Error" FONT 8, "MS Sans Serif" BEGIN @@ -243,7 +87,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO MOVEABLE PURE +GUIDELINES DESIGNINFO BEGIN IDD_LOADING_DIALOG, DIALOG BEGIN @@ -263,6 +107,89 @@ BEGIN END #endif // APSTUDIO_INVOKED + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON "StepMania.ICO" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + 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" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +BITMAP_ERROR BITMAP "error.bmp" +BITMAP_LOADING BITMAP "loading.bmp" +BITMAP_CRASH BITMAP "error2.bmp" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/stepmania/src/resource.h b/stepmania/src/resource.h index 3b65955aca..dc21dc16e0 100644 --- a/stepmania/src/resource.h +++ b/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 @@ -7,8 +7,6 @@ #define IDD_LOADING_DIALOG 116 #define BITMAP_LOADING 117 #define BITMAP_CRASH 121 -#define IDD_DIALOG1 126 -#define IDD_DIALOG2 127 #define BITMAP_ERROR 129 #define IDD_DISASM_CRASH 199 #define IDC_SHOCKWAVEFLASH1 1000