Index: libraries/win32/wxwidgets/README.txt =================================================================== --- libraries/win32/wxwidgets/README.txt +++ libraries/win32/wxwidgets/README.txt @@ -1,9 +1,11 @@ -Since the wxWidgets library is quite large (~250MB for the include and lib files), and is not needed unless you want to compile Atlas, it is not included in SVN and should instead be installed manually: - -* Download the Windows source code from http://wxwidgets.org/downloads/ -* Open build\msw\wx_vc12.sln in Visual Studio 2013 (same version as used for the game) -* Select the "Debug" configuration -* Build -* Select the "Release" configuration -* Build -* Copy lib\ and include\ into the game's libraries\win32\wxwidgets folder +Since the wxWidgets library is quite large (~250MB for the include and lib files), and is not needed unless you want to compile Atlas, it is not included in SVN and should instead be installed manually: + +NOTE: wxWidgets 3.x or higher is required. + +* Download the Windows source code from http://wxwidgets.org/downloads/ +* Open build\msw\wx_vc12.sln in Visual Studio 2013 (same version as used for the game) +* Select the "Debug" configuration +* Build +* Select the "Release" configuration +* Build +* Copy lib\ and include\ into the game's libraries\win32\wxwidgets folder Index: source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h =================================================================== --- source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h +++ source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2019 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -28,11 +28,7 @@ virtual void SaveToSubDir(wxConfigBase& config); private: -#if wxCHECK_VERSION(2, 9, 0) virtual void Load(const wxConfigBase& config) -#else - virtual void Load(wxConfigBase& config) -#endif { wxFileHistory::Load(config); } Index: source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h =================================================================== --- source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h +++ source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Wildfire Games. +/* Copyright (C) 2019 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -19,11 +19,7 @@ #define INCLUDED_MAPDIALOG #include -#include -#if !wxCHECK_VERSION(2, 9, 0) -#define wxBookCtrlEvent wxNotebookEvent -#endif class wxBookCtrlEvent; enum MapDialogType { MAPDIALOG_OPEN, MAPDIALOG_SAVE }; Index: source/tools/atlas/AtlasUI/Misc/precompiled.h =================================================================== --- source/tools/atlas/AtlasUI/Misc/precompiled.h +++ source/tools/atlas/AtlasUI/Misc/precompiled.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015 Wildfire Games. +/* Copyright (C) 2019 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -116,6 +116,11 @@ # define ATLASDLLIMPEXP extern "C" #endif +// wxWidgets 3.0 or later required +#if !wxCHECK_VERSION(3, 0, 0) +# error You are using an old wxWidgets release. At least wxWidgets >= 3.0.0 is required. +#endif + // Abort with an obvious message if wx isn't Unicode, instead of complaining // mysteriously when it first discovers wxChar != wchar_t #ifndef UNICODE Index: source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp =================================================================== --- source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp +++ source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2015 Wildfire Games. +/* Copyright (C) 2019 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -26,7 +26,6 @@ #include #include #include -#include using AtlasMessage::Position; @@ -143,13 +142,8 @@ else if (xmlData->GetName() == wxT("Position")) { wxString x, z; -#if wxCHECK_VERSION(3, 0, 0) xmlData->GetAttribute(wxT("x"), &x); xmlData->GetAttribute(wxT("z"), &z); -#else - xmlData->GetPropVal(wxT("x"), &x); - xmlData->GetPropVal(wxT("z"), &z); -#endif double aux, aux2; x.ToDouble(&aux); @@ -160,11 +154,7 @@ else if (xmlData->GetName() == wxT("Orientation")) { wxString y; -#if wxCHECK_VERSION(3, 0, 0) xmlData->GetAttribute(wxT("y"), &y); -#else - xmlData->GetPropVal(wxT("y"), &y); -#endif y.ToDouble(&orientation); } else if (xmlData->GetName() == wxT("Player"))