Skip to content

Commit b8b49da

Browse files
author
Bart Roossien
committed
Fixes based on review comments
1 parent d7ae867 commit b8b49da

File tree

7 files changed

+65
-20
lines changed

7 files changed

+65
-20
lines changed

‎Core/Libraries/Source/WWVegas/WW3D2/framgrab.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@
3636

3737
#pragma once
3838

39-
#include "always.h"
40-
#include "windows.h"
41-
#include "windowsx.h"
42-
#include "vfw.h"
43-
4439
#if defined (_MSC_VER)
4540
#pragma warning (push, 3) // (gth) system headers complain at warning level 4...
4641
#pragma warning (pop)
4742
#endif
4843

44+
#include "always.h"
45+
#include "windows.h"
46+
#include "windowsx.h"
47+
#include "vfw.h"
48+
4949
// FramGrab.h: interface for the FrameGrabClass class.
5050
//
5151
//////////////////////////////////////////////////////////////////////

‎Core/Tools/DebugWindow/StdAfx.h‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,26 @@
3030

3131
#include <afxwin.h> // MFC core and standard components
3232
#include <afxext.h> // MFC extensions
33+
34+
#ifndef _AFX_NO_OLE_SUPPORT
3335
#include <afxole.h> // MFC OLE classes
3436
#include <afxodlgs.h> // MFC OLE dialog classes
3537
#include <afxdisp.h> // MFC Automation classes
36-
#include <afxdb.h> // MFC ODBC database classes
37-
#include <afxdao.h> // MFC DAO database classes
38-
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
39-
#include <afxcmn.h> // MFC support for Windows Common Controls
38+
#endif // _AFX_NO_OLE_SUPPORT
39+
40+
41+
#ifndef _AFX_NO_DB_SUPPORT
42+
#include <afxdb.h> // MFC ODBC database classes
43+
#endif // _AFX_NO_DB_SUPPORT
44+
45+
#ifndef _AFX_NO_DAO_SUPPORT
46+
#include <afxdao.h> // MFC DAO database classes
47+
#endif // _AFX_NO_DAO_SUPPORT
48+
49+
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
50+
#ifndef _AFX_NO_AFXCMN_SUPPORT
51+
#include <afxcmn.h> // MFC support for Windows Common Controls
52+
#endif // _AFX_NO_AFXCMN_SUPPORT
4053

4154
// I don't care that debug symbols are longer than 255, I won't read them anyways.
4255
#pragma warning (disable : 4786)

‎Core/Tools/W3DView/StdAfx.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232

3333
#include <afxwin.h> // MFC core and standard components
3434
#include <afxext.h> // MFC extensions
35-
#include <afxcmn.h> // MFC support for Windows Common Controls
35+
#ifndef _AFX_NO_AFXCMN_SUPPORT
36+
#include <afxcmn.h> // MFC support for Windows Common Controls
37+
#endif // _AFX_NO_AFXCMN_SUPPORT
3638

3739
//{{AFX_INSERT_LOCATION}}
3840
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.

‎Generals/Code/Tools/ParticleEditor/StdAfx.h‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,26 @@
3030

3131
#include <afxwin.h> // MFC core and standard components
3232
#include <afxext.h> // MFC extensions
33+
34+
#ifndef _AFX_NO_OLE_SUPPORT
3335
#include <afxole.h> // MFC OLE classes
3436
#include <afxodlgs.h> // MFC OLE dialog classes
3537
#include <afxdisp.h> // MFC Automation classes
36-
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
37-
#include <afxdb.h> // MFC ODBC database classes
38-
#include <afxdao.h> // MFC DAO database classes
39-
#include <afxcmn.h> // MFC support for Windows Common Controls
38+
#endif // _AFX_NO_OLE_SUPPORT
39+
40+
41+
#ifndef _AFX_NO_DB_SUPPORT
42+
#include <afxdb.h> // MFC ODBC database classes
43+
#endif // _AFX_NO_DB_SUPPORT
44+
45+
#ifndef _AFX_NO_DAO_SUPPORT
46+
#include <afxdao.h> // MFC DAO database classes
47+
#endif // _AFX_NO_DAO_SUPPORT
48+
49+
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
50+
#ifndef _AFX_NO_AFXCMN_SUPPORT
51+
#include <afxcmn.h> // MFC support for Windows Common Controls
52+
#endif // _AFX_NO_AFXCMN_SUPPORT
4053

4154
// I don't care that debug symbols are longer than 255, I won't read them anyways.
4255
#pragma warning (disable : 4786)

‎Generals/Code/Tools/WorldBuilder/include/StdAfx.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
#include <afxwin.h> // MFC core and standard components
3636
#include <afxext.h> // MFC extensions
3737
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
38+
#ifndef _AFX_NO_AFXCMN_SUPPORT
3839
#include <afxcmn.h> // MFC support for Windows Common Controls
40+
#endif // _AFX_NO_AFXCMN_SUPPORT
3941

4042
#include <Utility/stdio_adapter.h>
4143

‎GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,26 @@
3030

3131
#include <afxwin.h> // MFC core and standard components
3232
#include <afxext.h> // MFC extensions
33+
34+
#ifndef _AFX_NO_OLE_SUPPORT
3335
#include <afxole.h> // MFC OLE classes
3436
#include <afxodlgs.h> // MFC OLE dialog classes
3537
#include <afxdisp.h> // MFC Automation classes
36-
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
37-
#include <afxdb.h> // MFC ODBC database classes
38-
#include <afxdao.h> // MFC DAO database classes
39-
#include <afxcmn.h> // MFC support for Windows Common Controls
38+
#endif // _AFX_NO_OLE_SUPPORT
39+
40+
41+
#ifndef _AFX_NO_DB_SUPPORT
42+
#include <afxdb.h> // MFC ODBC database classes
43+
#endif // _AFX_NO_DB_SUPPORT
44+
45+
#ifndef _AFX_NO_DAO_SUPPORT
46+
#include <afxdao.h> // MFC DAO database classes
47+
#endif // _AFX_NO_DAO_SUPPORT
48+
49+
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
50+
#ifndef _AFX_NO_AFXCMN_SUPPORT
51+
#include <afxcmn.h> // MFC support for Windows Common Controls
52+
#endif // _AFX_NO_AFXCMN_SUPPORT
4053

4154
// I don't care that debug symbols are longer than 255, I won't read them anyways.
4255
#pragma warning (disable : 4786)

‎GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@
3434

3535
#include <afxwin.h> // MFC core and standard components
3636
#include <afxext.h> // MFC extensions
37-
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
38-
#include <afxcmn.h> // MFC support for Windows Common Controls
37+
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
38+
#ifndef _AFX_NO_AFXCMN_SUPPORT
39+
#include <afxcmn.h> // MFC support for Windows Common Controls
40+
#endif // _AFX_NO_AFXCMN_SUPPORT
3941

4042
#include <Utility/stdio_adapter.h>
4143

0 commit comments

Comments
 (0)