[Cmake-commits] CMake branch, next, updated. v2.8.6-1784-gd0df59b

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d0df59b5b746d747ba930086f73652045382c0c3 (commit)
       via  a42e3f2bf915c510b43fd0f8c90f4716aab41541 (commit)
      from  889965d92ffa2b71146aebea8a5c090b08533213 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0df59b5b746d747ba930086f73652045382c0c3
commit d0df59b5b746d747ba930086f73652045382c0c3
Merge: 889965d a42e3f2
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Nov 3 08:43:00 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 3 08:43:00 2011 -0400

    Merge topic 'add-mfc-test' into next
    
    a42e3f2 Tests: Fix MFC test for old vs6 dashboards (#11213)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a42e3f2bf915c510b43fd0f8c90f4716aab41541
commit a42e3f2bf915c510b43fd0f8c90f4716aab41541
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Nov 3 08:37:23 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Nov 3 08:37:23 2011 -0400

    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.

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

-----------------------------------------------------------------------

Summary of changes:
 Tests/MFC/mfc1/mfc1.rc |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake