[Winmerge-svn] SF.net SVN: winmerge:[7471] branches/R2_14/Src/Common

[<ge...@us...>]

Revision: 7471
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7471&view=rev
Author:   gerundt
Date:     2010-12-08 11:24:20 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
Relate definition of NCHITTEST_RESULT to _MFC_VER, not _MSC_VER, to enable use of VS2010 Express in conjunction with MFC71

Modified Paths:
--------------
    branches/R2_14/Src/Common/scbarg.h
    branches/R2_14/Src/Common/sizecbar.h

Modified: branches/R2_14/Src/Common/scbarg.h
===================================================================
--- branches/R2_14/Src/Common/scbarg.h	2010-12-08 09:40:16 UTC (rev 7470)
+++ branches/R2_14/Src/Common/scbarg.h	2010-12-08 11:24:20 UTC (rev 7471)
@@ -35,7 +35,7 @@
 
 // MFC 8/VS.NET 2005 has breaking change in OnNcHitTest return value
 #ifndef NCHITTEST_RESULT
-#if _MSC_VER >= 1400
+#if _MFC_VER >= 0x0800
 #define NCHITTEST_RESULT LRESULT
 #else
 #define NCHITTEST_RESULT UINT

Modified: branches/R2_14/Src/Common/sizecbar.h
===================================================================
--- branches/R2_14/Src/Common/sizecbar.h	2010-12-08 09:40:16 UTC (rev 7470)
+++ branches/R2_14/Src/Common/sizecbar.h	2010-12-08 11:24:20 UTC (rev 7471)
@@ -38,7 +38,7 @@
 
 // MFC 8/VS.NET 2005 has breaking change in OnNcHitTest return value
 #ifndef NCHITTEST_RESULT
-#if _MSC_VER >= 1400
+#if _MFC_VER >= 0x0800
 #define NCHITTEST_RESULT LRESULT
 #else
 #define NCHITTEST_RESULT UINT


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.