diff --git a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp index 5a7b561837..af318841b1 100644 --- a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp +++ b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp @@ -156,14 +156,33 @@ static BOOL CALLBACK ErrorWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP Win32RestartProgram(); /* not reached */ ASSERT( 0 ); - EndDialog( hWnd, 0 ); break; - case IDOK: EndDialog( hWnd, 0 ); break; } + break; + case WM_CTLCOLORSTATIC: + { + HDC hdc = (HDC)wParam; + HWND hwndStatic = (HWND)lParam; + HBRUSH hbr = NULL; + + // TODO: Change any attributes of the DC here + switch( GetDlgCtrlID(hwndStatic) ) + { + case IDC_STATIC_HEADER_TEXT: + case IDC_STATIC_ICON: + hbr = (HBRUSH)::GetStockObject(WHITE_BRUSH); + SetBkMode( hdc, OPAQUE ); + SetBkColor( hdc, RGB(255,255,255) ); + break; + } + + // TODO: Return a different brush if the default is not desired + return (BOOL)hbr; + } } return FALSE; } diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp index f7861522ba..fb48e912f4 100644 --- a/stepmania/src/archutils/Win32/Crash.cpp +++ b/stepmania/src/archutils/Win32/Crash.cpp @@ -943,6 +943,26 @@ BOOL APIENTRY CrashDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) break; } break; + case WM_CTLCOLORSTATIC: + { + HDC hdc = (HDC)wParam; + HWND hwndStatic = (HWND)lParam; + HBRUSH hbr = NULL; + + // TODO: Change any attributes of the DC here + switch( GetDlgCtrlID(hwndStatic) ) + { + case IDC_STATIC_HEADER_TEXT: + case IDC_STATIC_ICON: + hbr = (HBRUSH)::GetStockObject(WHITE_BRUSH); + SetBkMode( hdc, OPAQUE ); + SetBkColor( hdc, RGB(255,255,255) ); + break; + } + + // TODO: Return a different brush if the default is not desired + return (BOOL)hbr; + } } return FALSE; diff --git a/stepmania/src/archutils/Win32/WindowsResources.h b/stepmania/src/archutils/Win32/WindowsResources.h index 1fb5cf28c0..de240f4c8b 100644 --- a/stepmania/src/archutils/Win32/WindowsResources.h +++ b/stepmania/src/archutils/Win32/WindowsResources.h @@ -10,7 +10,6 @@ #define IDD_DISASM_CRASH 120 #define BITMAP_CRASH 121 #define BITMAP_ERROR 129 -#define IDB_HEADER 131 #define IDC_SHOCKWAVEFLASH1 1000 #define IDC_BUTTON_RESTART 1001 #define IDM_TOGGLEFULLSCREEN 1002 @@ -35,6 +34,7 @@ #define IDC_CHECK2 1019 #define IDC_SPLASH 1020 #define IDC_STATIC_HEADER_TEXT 1021 +#define IDC_STATIC_ICON 1022 #define IDC_ASMBOX 1133 #define IDC_REGDUMP 1283 #define IDC_STATIC_BOMBREASON 1284 @@ -48,7 +48,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 132 #define _APS_NEXT_COMMAND_VALUE 40009 -#define _APS_NEXT_CONTROL_VALUE 1022 +#define _APS_NEXT_CONTROL_VALUE 1023 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/stepmania/src/archutils/Win32/WindowsResources.rc b/stepmania/src/archutils/Win32/WindowsResources.rc index 0c25776dd0..9a0fef0ac4 100644 --- a/stepmania/src/archutils/Win32/WindowsResources.rc +++ b/stepmania/src/archutils/Win32/WindowsResources.rc @@ -31,16 +31,18 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "Fatal Error" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,332,35 DEFPUSHBUTTON "Close",IDOK,265,215,60,15 EDITTEXT IDC_EDIT_ERROR,5,59,320,151,ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15 PUSHBUTTON "Report Error",IDC_BUTTON_REPORT,90,215,76,15 PUSHBUTTON "Restart Game",IDC_BUTTON_RESTART,175,215,80,15 - CONTROL 131,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 LTEXT "Specific details about the error are shown in the box below:", IDC_STATIC,7,45,319,11 LTEXT "Fatal Error",IDC_STATIC_HEADER_TEXT,5,5,249,23 + ICON IDI_ICON,IDC_STATIC_ICON,296,6,21,20 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,34,332,1 END IDD_LOADING_DIALOG DIALOG 0, 0, 312, 82 @@ -61,7 +63,6 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Program Crash" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - CONTROL 131,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 PUSHBUTTON "&View Crash Info",IDC_CRASH_SAVE,29,169,94,15 PUSHBUTTON "View &Log",IDC_VIEW_LOG,128,169,63,15 PUSHBUTTON "Report the &Error",IDC_BUTTON_REPORT,196,169,89,15 @@ -72,9 +73,12 @@ BEGIN LTEXT "A crash has occurred. Diagnostic information has been saved to a file called ""crashinfo.txt"" in the game program directory.", IDC_STATIC,8,41,312,19 LTEXT "Estimated call stack",IDC_STATIC,6,85,155,10 - LTEXT "Program Crash",IDC_STATIC_HEADER_TEXT,6,5,276,22 LTEXT "Crash reason:",IDC_STATIC,7,64,219,8 CTEXT "crash reason here",IDC_STATIC_BOMBREASON,6,72,322,11 + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,332,35 + LTEXT "Program Crash",IDC_STATIC_HEADER_TEXT,5,5,249,23 + ICON IDI_ICON,IDC_STATIC_ICON,296,6,21,20 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,34,332,1 END IDD_OK DIALOGEX 0, 0, 336, 98 @@ -200,13 +204,6 @@ BEGIN END END - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_HEADER BITMAP "header.bmp" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/stepmania/src/archutils/Win32/header.bmp b/stepmania/src/archutils/Win32/header.bmp deleted file mode 100644 index 9a2c6a71f0..0000000000 Binary files a/stepmania/src/archutils/Win32/header.bmp and /dev/null differ