From b3cd340eec4024f8024b4c2f7be42f5cc2bced4c Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Wed, 13 Apr 2005 05:08:45 +0000 Subject: [PATCH] Updated binaries, and ScEd. This was SVN commit r2129. --- source/tools/sced/ui/BrushShapeEditorDlgBar.cpp | 2 ++ source/tools/sced/ui/ScEdView.cpp | 2 ++ source/tools/sced/ui/UnitPropertiesDlgBar.cpp | 2 ++ source/tools/sced/ui/UnitToolsDlgBar.cpp | 2 ++ 4 files changed, 8 insertions(+) diff --git a/source/tools/sced/ui/BrushShapeEditorDlgBar.cpp b/source/tools/sced/ui/BrushShapeEditorDlgBar.cpp index 80731dcf36..d4a4723337 100755 --- a/source/tools/sced/ui/BrushShapeEditorDlgBar.cpp +++ b/source/tools/sced/ui/BrushShapeEditorDlgBar.cpp @@ -7,6 +7,8 @@ #include "BrushShapeEditorDlgBar.h" #undef _IGNORE_WGL_H_ +#undef CRect // because it was redefined to PS_Rect in Overlay.h + BEGIN_MESSAGE_MAP(CBrushShapeEditorDlgBar, CDialogBar) //{{AFX_MSG_MAP(CBrushShapeEditorDlgBar) // NOTE - the ClassWizard will add and remove mapping macros here. diff --git a/source/tools/sced/ui/ScEdView.cpp b/source/tools/sced/ui/ScEdView.cpp index 59e22ee04d..8a99204327 100755 --- a/source/tools/sced/ui/ScEdView.cpp +++ b/source/tools/sced/ui/ScEdView.cpp @@ -22,6 +22,8 @@ #include "res/vfs.h" +#undef CRect // because it was redefined to PS_Rect in Overlay.h + int g_ClickMode=0; static unsigned int GetModifierKeyFlags() diff --git a/source/tools/sced/ui/UnitPropertiesDlgBar.cpp b/source/tools/sced/ui/UnitPropertiesDlgBar.cpp index 969649b66c..ae9ae46d52 100755 --- a/source/tools/sced/ui/UnitPropertiesDlgBar.cpp +++ b/source/tools/sced/ui/UnitPropertiesDlgBar.cpp @@ -13,6 +13,8 @@ #include "UIGlobals.h" #undef _IGNORE_WGL_H_ +#undef CRect // because it was redefined to PS_Rect in Overlay.h + BEGIN_MESSAGE_MAP(CUnitPropertiesDlgBar, CDialogBar) //{{AFX_MSG_MAP(CUnitPropertiesDlgBar) // NOTE - the ClassWizard will add and remove mapping macros here. diff --git a/source/tools/sced/ui/UnitToolsDlgBar.cpp b/source/tools/sced/ui/UnitToolsDlgBar.cpp index fe7f79d7e9..c1bc11c301 100755 --- a/source/tools/sced/ui/UnitToolsDlgBar.cpp +++ b/source/tools/sced/ui/UnitToolsDlgBar.cpp @@ -10,6 +10,8 @@ #include "BaseEntityCollection.h" +#undef CRect // because it was redefined to PS_Rect in Overlay.h + BEGIN_MESSAGE_MAP(CUnitToolsDlgBar, CDialogBar) //{{AFX_MSG_MAP(CUnitToolsDlgBar) // NOTE - the ClassWizard will add and remove mapping macros here.