diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h index acdffcfc20..dfd2c2c6c8 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2025 Wildfire Games. +/* Copyright (C) 2026 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -32,17 +32,18 @@ class CinemaSidebar : public Sidebar public: CinemaSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer); - virtual void OnMapReload(); - virtual void OnTogglePathsDrawing(wxCommandEvent& evt); - virtual void OnAddPath(wxCommandEvent& evt); - virtual void OnDeletePath(wxCommandEvent& evt); + void OnMapReload() override; + +protected: + void OnFirstDisplay() override; + +private: + void OnTogglePathsDrawing(wxCommandEvent& evt); + void OnAddPath(wxCommandEvent& evt); + void OnDeletePath(wxCommandEvent& evt); void ReloadPathList(); -protected: - virtual void OnFirstDisplay(); - -private: wxScrolledWindow* scrolledWindow; wxCheckBox* m_DrawPath; wxListBox* m_PathList; diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h index fc7f5c0ce3..d494e68320 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2025 Wildfire Games. +/* Copyright (C) 2026 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -30,16 +30,18 @@ class EnvironmentSidebar : public Sidebar public: EnvironmentSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer); - void OnPickWaterHeight(wxCommandEvent& evt); - virtual void OnMapReload(); - virtual void RecomputeWaterData(wxCommandEvent& evt); + void OnMapReload() override; void UpdateEnvironmentSettings(); protected: - virtual void OnFirstDisplay(); + void OnFirstDisplay() override; private: + void OnPickWaterHeight(wxCommandEvent& evt); + + void RecomputeWaterData(wxCommandEvent& evt); + VariableListBox* m_PostEffectList; VariableListBox* m_SkyList; VariableListBox* m_WaterTypeList; diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h index 3ac28da6aa..7ac01bd72f 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2025 Wildfire Games. +/* Copyright (C) 2026 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -30,10 +30,10 @@ class MapSidebar : public Sidebar public: MapSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer); - virtual void OnMapReload(); + void OnMapReload() override; protected: - virtual void OnFirstDisplay(); + void OnFirstDisplay() override; private: MapSettingsControl* m_MapSettingsCtrl; diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h index a54609a4ec..b25a6e3fe7 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2025 Wildfire Games. +/* Copyright (C) 2026 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -30,10 +30,11 @@ class ObjectSidebar : public Sidebar public: ObjectSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer); ~ObjectSidebar(); + void FilterObjects(); protected: - virtual void OnFirstDisplay(); + void OnFirstDisplay() override; private: void OnToolChange(ITool* tool); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h index 5c7c0afe85..ef0debd847 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2025 Wildfire Games. +/* Copyright (C) 2026 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -41,10 +41,10 @@ class PlayerSidebar : public Sidebar public: PlayerSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer); - virtual void OnMapReload(); + void OnMapReload() override; protected: - virtual void OnFirstDisplay(); + void OnFirstDisplay() override; private: PlayerSettingsControl* m_PlayerSettingsCtrl;