From a42e3f2bf915c510b43fd0f8c90f4716aab41541 Mon Sep 17 00:00:00 2001 From: David Cole Date: Thu, 3 Nov 2011 08:37:23 -0400 Subject: Tests: Fix MFC test for old vs6 dashboards (#11213) The MFC test's mfc1 directory was a "VS-MFC-wizard-generated" starter MFC app, using VS 7.1 as the generator. There's one define used in the generated rc file that was not available back in the VS6 days... Put a conditional define in here based on _MSC_VER to enable the test app to build on VS6 dashboards. --- Tests/MFC/mfc1/mfc1.rc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Tests/MFC/mfc1/mfc1.rc b/Tests/MFC/mfc1/mfc1.rc index c960302..346c5fb 100644 --- a/Tests/MFC/mfc1/mfc1.rc +++ b/Tests/MFC/mfc1/mfc1.rc @@ -198,9 +198,15 @@ END // Dialog // +#if _MSC_VER < 1300 +#define DS_SHELLFONT_FLAG 0 +#else +#define DS_SHELLFONT_FLAG DS_SHELLFONT +#endif + IDD_ABOUTBOX DIALOGEX 0, 0, 235, 55 CAPTION "About mfc1" -STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_SHELLFONT_FLAG | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 -- cgit v0.12