diff --git a/stepmania/src/StepMania.RC b/stepmania/src/StepMania.RC index 782c695bd4..86e2cd5f41 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" @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // 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 @@ -42,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 CTEXT "line1",IDC_STATIC_MESSAGE1,0,41,310,10,SS_NOPREFIX | @@ -56,30 +56,31 @@ BEGIN END IDD_DISASM_CRASH DIALOGEX 0, 0, 399, 151 -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 - DEFPUSHBUTTON "Close",IDC_BUTTON_CLOSE,348,135,50,15 + PUSHBUTTON "&View crash dump",IDC_CRASH_SAVE,1,135,70,15 + PUSHBUTTON "View &Log",IDC_VIEW_LOG,75,135,70,15 + PUSHBUTTON "Report the &Error",IDC_BUTTON_REPORT,210,135,76,15 + PUSHBUTTON "&Close",IDC_BUTTON_CLOSE,348,135,50,15 + PUSHBUTTON "&Restart",IDC_BUTTON_RESTART,348,118,50,15 + LISTBOX IDC_CALL_STACK,7,76,391,38,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP LTEXT "crash reason: programmer needs good whack on head", IDC_STATIC_BOMBREASON,8,120,219,8 - PUSHBUTTON "View Log",IDC_VIEW_LOG,1,135,70,15 - PUSHBUTTON "View crash dump",IDC_CRASH_SAVE,75,135,70,15 - PUSHBUTTON "Report the Error",IDC_BUTTON_REPORT,210,135,76,15 - PUSHBUTTON "Restart",IDC_BUTTON_RESTART,348,118,50,15 CONTROL 121,IDC_STATIC,"Static",SS_BITMAP,1,2,396,36 LTEXT "StepMania has crashed due to a program error. Diagnostic information has been saved to a file called ""crashinfo.txt"" in the StepMania program directory. Hit ""View crash dump"" to view it. Please include this file in all bug reports.", IDC_STATIC,8,41,382,19 - LISTBOX IDC_CALL_STACK,7,76,391,38,LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_TABSTOP LTEXT "Estimated call stack",IDC_STATIC,7,64,64,8 END -IDD_OK DIALOG DISCARDABLE 0, 0, 318, 87 -STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_OK DIALOG 0, 0, 318, 87 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION CAPTION "StepMania" FONT 8, "MS Shell Dlg" -BEGIN +BEGIN DEFPUSHBUTTON "OK",IDOK,131,66,50,14 CONTROL "&Don't display this message",IDC_HUSH,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,211,67,100,10 @@ -95,7 +96,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO MOVEABLE PURE +GUIDELINES DESIGNINFO BEGIN IDD_LOADING_DIALOG, DIALOG BEGIN @@ -130,18 +131,18 @@ END // 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" @@ -157,9 +158,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 @@ -182,14 +182,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" @@ -198,16 +198,14 @@ BEGIN END END -#endif // !_MAC - ///////////////////////////////////////////////////////////////////////////// // // Bitmap // -BITMAP_ERROR BITMAP MOVEABLE PURE "error.bmp" -BITMAP_CRASH BITMAP MOVEABLE PURE "error2.bmp" +BITMAP_ERROR BITMAP "error.bmp" +BITMAP_CRASH BITMAP "error2.bmp" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp index b3b3c1661b..d6491ac5c2 100644 --- a/stepmania/src/archutils/Win32/Crash.cpp +++ b/stepmania/src/archutils/Win32/Crash.cpp @@ -791,7 +791,7 @@ BOOL APIENTRY CrashDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { EndDialog(hDlg, FALSE); return TRUE; case IDOK: - EndDialog(hDlg, TRUE); + // EndDialog(hDlg, TRUE); /* don't always exit on ENTER */ return TRUE; case IDC_VIEW_LOG: ViewWithNotepad("../log.txt");