|
From: Andre R. <and...@us...> - 2006-03-04 22:58:44
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16470/Common/headers Modified Files: WinLand.h frontier.h Log Message: Fixed most Visual Studio .NET 2003 compiler warnings. Index: WinLand.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/WinLand.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WinLand.h 11 Jan 2005 22:48:00 -0000 1.3 --- WinLand.h 4 Mar 2006 22:58:39 -0000 1.4 *************** *** 21,25 **** //#define GET_WM_COMMAND_MPS(id, hwnd, cmd) (UINT)MAKELONG(id, cmd), (LONG)(hwnd) //#define GET_EM_SETSEL_MPS(iStart, iEnd) (UINT)(iStart), (LONG)(iEnd) ! #define GET_WM_MDIACTIVATE_FACTIVATE(hwnd, wp, lp) (lp == (LONG)hwnd) #else #define GET_EM_SETSEL_MPS(iStart, iEnd) 0, MAKELONG(iStart, iEnd) --- 21,25 ---- //#define GET_WM_COMMAND_MPS(id, hwnd, cmd) (UINT)MAKELONG(id, cmd), (LONG)(hwnd) //#define GET_EM_SETSEL_MPS(iStart, iEnd) (UINT)(iStart), (LONG)(iEnd) ! //#define GET_WM_MDIACTIVATE_FACTIVATE(hwnd, wp, lp) (lp == (LONG)hwnd) #else #define GET_EM_SETSEL_MPS(iStart, iEnd) 0, MAKELONG(iStart, iEnd) Index: frontier.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontier.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** frontier.h 11 Jan 2005 22:48:01 -0000 1.5 --- frontier.h 4 Mar 2006 22:58:39 -0000 1.6 *************** *** 28,31 **** --- 28,34 ---- /* 2004-10-23 aradke: New global header file, to be included from all source files. + + 2006-03-04 aradke: disable MS Visual C++ warning about unknown pragmas + so it won't complain about "#pragma unused(foo)" */ *************** *** 40,45 **** #ifdef WIN95VERSION ! #ifndef __MWERKS__ ! #pragma warning (disable: 4244 4761; error: 4013) #endif #endif /* WIN95VERSION */ --- 43,55 ---- #ifdef WIN95VERSION ! #if (defined(_MSC_VER) && !defined(__MWERKS__)) ! /* ! 2006-03-04 aradke: Key to MS Visual C++ warning numbers ! 4244: conversion from [e.g.] 'long' to 'short', possible loss of data ! 4761: integral size mismatch in argument; conversion supplied ! 4068: unknown pragma ! 4013: 'fooBarFunction' undefined; assuming extern returning int ! */ ! #pragma warning (disable: 4244 4761 4068; error: 4013) #endif #endif /* WIN95VERSION */ |