From 2fae39df3bdeeb051769d50352aae89f3d865a04 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Sat, 18 Jul 2026 12:04:57 +0200 Subject: [PATCH] Use new WX event macros Were added in 2010. Signed-off-by: Ralph Sennhauser --- .../atlas/AtlasUI/ActorEditor/ActorEditor.cpp | 4 ++-- .../atlas/AtlasUI/ActorEditor/ActorEditor.h | 2 +- .../CustomControls/Buttons/ToolButton.cpp | 10 ++++---- .../CustomControls/Buttons/ToolButton.h | 4 ++-- .../AtlasUI/CustomControls/Canvas/Canvas.cpp | 6 ++--- .../AtlasUI/CustomControls/Canvas/Canvas.h | 2 +- .../DraggableListCtrl/DraggableListCtrl.cpp | 6 ++--- .../DraggableListCtrl/DraggableListCtrl.h | 2 +- .../EditableListCtrl/EditableListCtrl.cpp | 6 ++--- .../EditableListCtrl/EditableListCtrl.h | 2 +- .../EditableListCtrl/QuickComboBox.cpp | 6 ++--- .../EditableListCtrl/QuickComboBox.h | 2 +- .../EditableListCtrl/QuickFileCtrl.cpp | 14 +++++------ .../EditableListCtrl/QuickTextCtrl.cpp | 6 ++--- .../EditableListCtrl/QuickTextCtrl.h | 2 +- .../CustomControls/MapDialog/MapDialog.cpp | 6 ++--- .../CustomControls/MapDialog/MapDialog.h | 2 +- .../MapResizeDialog/MapResizeDialog.cpp | 4 ++-- .../MapResizeDialog/MapResizeDialog.h | 2 +- .../MapResizeDialog/PseudoMiniMapPanel.cpp | 4 ++-- .../MapResizeDialog/PseudoMiniMapPanel.h | 2 +- .../SnapSplitterWindow/SnapSplitterWindow.cpp | 6 ++--- .../SnapSplitterWindow/SnapSplitterWindow.h | 2 +- .../VirtualDirTreeCtrl/virtualdirtreectrl.cpp | 6 ++--- .../VirtualDirTreeCtrl/virtualdirtreectrl.h | 2 +- .../CustomControls/Windows/AtlasDialog.cpp | 6 ++--- .../CustomControls/Windows/AtlasDialog.h | 2 +- .../CustomControls/Windows/AtlasWindow.cpp | 10 ++++---- .../CustomControls/Windows/AtlasWindow.h | 2 +- .../AtlasUI/ScenarioEditor/ScenarioEditor.cpp | 10 ++++---- .../AtlasUI/ScenarioEditor/ScenarioEditor.h | 2 +- .../AtlasUI/ScenarioEditor/SectionLayout.cpp | 12 +++++----- .../ScenarioEditor/Sections/Cinema/Cinema.cpp | 4 ++-- .../ScenarioEditor/Sections/Cinema/Cinema.h | 2 +- .../Sections/Environment/Environment.cpp | 22 ++++++++--------- .../Sections/Environment/Environment.h | 2 +- .../Sections/Environment/LightControl.cpp | 6 ++--- .../ScenarioEditor/Sections/Map/Map.cpp | 10 ++++---- .../AtlasUI/ScenarioEditor/Sections/Map/Map.h | 2 +- .../ScenarioEditor/Sections/Object/Object.cpp | 16 ++++++------- .../ScenarioEditor/Sections/Object/Object.h | 2 +- .../ScenarioEditor/Sections/Player/Player.cpp | 24 +++++++++---------- .../Sections/Terrain/Terrain.cpp | 22 ++++++++--------- .../ScenarioEditor/Sections/Terrain/Terrain.h | 2 +- 44 files changed, 134 insertions(+), 134 deletions(-) diff --git a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp index 2f6563f1e9..4f559996e0 100644 --- a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp +++ b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp @@ -50,9 +50,9 @@ class wxWindow; -BEGIN_EVENT_TABLE(ActorEditor, AtlasWindow) +wxBEGIN_EVENT_TABLE(ActorEditor, AtlasWindow) EVT_MENU(ID_CreateEntity, ActorEditor::OnCreateEntity) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ActorEditor::ActorEditor(wxWindow* parent) diff --git a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h index 60a047b0f6..b5fe9682a7 100644 --- a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h +++ b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h @@ -61,5 +61,5 @@ private: // but should be persisted so for convenience keep a copy of the last loaded file. AtObj m_Actor; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.cpp b/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.cpp index 02b047cb6a..52f6199812 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.cpp @@ -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 @@ -39,9 +39,9 @@ class wxWindow; -BEGIN_EVENT_TABLE(ToolButton, wxButton) +wxBEGIN_EVENT_TABLE(ToolButton, wxButton) EVT_BUTTON(wxID_ANY, ToolButton::OnClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ToolButton::ToolButton (ToolManager& toolManager, wxWindow *parent, const wxString& label, const wxString& toolName, const wxSize& size, long style) @@ -77,9 +77,9 @@ void ToolButton::SetSelectedAppearance(bool selected) ////////////////////////////////////////////////////////////////////////// -BEGIN_EVENT_TABLE(ToolButtonBar, wxToolBar) +wxBEGIN_EVENT_TABLE(ToolButtonBar, wxToolBar) EVT_TOOL(wxID_ANY, ToolButtonBar::OnTool) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ToolButtonBar::ToolButtonBar(ToolManager& toolManager, wxWindow* parent, SectionLayout* sectionLayout, int baseID, long style) : wxToolBar(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style) diff --git a/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.h b/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.h index 181554a970..82cc253ae7 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.h +++ b/source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.h @@ -41,7 +41,7 @@ private: wxString m_Tool; bool m_Selected; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; class ToolButtonBar : public wxToolBar @@ -68,5 +68,5 @@ private: std::map m_Buttons; SectionLayout* m_SectionLayout; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.cpp b/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.cpp index 1949de139f..56038dde5e 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.cpp @@ -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 @@ -107,7 +107,7 @@ void Canvas::OnMouse(wxMouseEvent& evt) HandleMouseEvent(evt); } -BEGIN_EVENT_TABLE(Canvas, wxGLCanvas) +wxBEGIN_EVENT_TABLE(Canvas, wxGLCanvas) EVT_SIZE (Canvas::OnResize) EVT_LEFT_DCLICK (Canvas::OnMouse) EVT_LEFT_DOWN (Canvas::OnMouse) @@ -121,4 +121,4 @@ BEGIN_EVENT_TABLE(Canvas, wxGLCanvas) EVT_MOUSEWHEEL (Canvas::OnMouse) EVT_MOTION (Canvas::OnMouse) EVT_MOUSE_CAPTURE_LOST(Canvas::OnMouseCaptureLost) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h b/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h index 14be1cb9ea..a25acb5e92 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h +++ b/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h @@ -45,5 +45,5 @@ private: wxPoint m_LastMousePos; bool m_MouseCaptured; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.cpp index fe632f04d4..5c787b86c0 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.cpp @@ -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 @@ -153,11 +153,11 @@ void DraggableListCtrl::OnChar(wxKeyEvent& event) } -BEGIN_EVENT_TABLE(DraggableListCtrl, EditableListCtrl) +wxBEGIN_EVENT_TABLE(DraggableListCtrl, EditableListCtrl) EVT_LIST_BEGIN_DRAG(wxID_ANY, DraggableListCtrl::OnBeginDrag) EVT_LIST_ITEM_SELECTED(wxID_ANY, DraggableListCtrl::OnItemSelected) EVT_MOTION(DraggableListCtrl::OnMouseEvent) EVT_LEFT_UP(DraggableListCtrl::OnMouseEvent) EVT_CHAR(DraggableListCtrl::OnChar) EVT_MOUSE_CAPTURE_LOST(DraggableListCtrl::OnMouseCaptureLost) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h index 943f3bb23a..c430cd8aa4 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h +++ b/source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h @@ -61,7 +61,7 @@ public: private: long m_DragSource; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; #endif // INCLUDED_DRAGGABLELISTCTRL diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp index f7917a6560..4af1d73e32 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp @@ -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 @@ -321,8 +321,8 @@ AtObj EditableListCtrl::FreezeData() -BEGIN_EVENT_TABLE(EditableListCtrl, wxListCtrl) +wxBEGIN_EVENT_TABLE(EditableListCtrl, wxListCtrl) EVT_LEFT_DCLICK(EditableListCtrl::OnMouseEvent) EVT_RIGHT_DOWN(EditableListCtrl::OnMouseEvent) EVT_CHAR(EditableListCtrl::OnKeyDown) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h index 86e11b0e6d..d16bf3916c 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h +++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h @@ -116,7 +116,7 @@ protected: wxListItemAttr m_ListItemAttr[2]; // standard+alternate colors - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; #endif // INCLUDED_EDITABLELISTCTRL diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.cpp b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.cpp index f7a15ff5c6..ae23bc88be 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.cpp @@ -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 @@ -67,7 +67,7 @@ void QuickComboBox::OnChar(wxKeyEvent& event) event.Skip(); } -BEGIN_EVENT_TABLE(QuickComboBox, wxComboBox) +wxBEGIN_EVENT_TABLE(QuickComboBox, wxComboBox) EVT_KILL_FOCUS(QuickComboBox::OnKillFocus) EVT_CHAR(QuickComboBox::OnChar) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.h index 91b68ad2c8..2273a8519b 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.h +++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.h @@ -32,5 +32,5 @@ public: void OnChar(wxKeyEvent& event); private: - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp index 5895bf2db0..f8b84ed480 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp @@ -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 @@ -79,13 +79,13 @@ public: event.Skip(); } - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(FileCtrl_TextCtrl, wxTextCtrl) +wxBEGIN_EVENT_TABLE(FileCtrl_TextCtrl, wxTextCtrl) EVT_KILL_FOCUS(FileCtrl_TextCtrl::OnKillFocus) EVT_CHAR(FileCtrl_TextCtrl::OnChar) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() class FileCtrl_Button : public wxButton { @@ -105,13 +105,13 @@ public: virtual void OnPress(wxCommandEvent& event)=0; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(FileCtrl_Button, wxButton) +wxBEGIN_EVENT_TABLE(FileCtrl_Button, wxButton) EVT_KILL_FOCUS(FileCtrl_Button::OnKillFocus) EVT_BUTTON(wxID_ANY, FileCtrl_Button::OnPress) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ////////////////////////////////////////////////////////////////////////// diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.cpp index bfb5ad32cc..3e9bbfacb6 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.cpp @@ -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 @@ -58,7 +58,7 @@ void QuickTextCtrl::OnChar(wxKeyEvent& event) event.Skip(); } -BEGIN_EVENT_TABLE(QuickTextCtrl, wxTextCtrl) +wxBEGIN_EVENT_TABLE(QuickTextCtrl, wxTextCtrl) EVT_KILL_FOCUS(QuickTextCtrl::OnKillFocus) EVT_CHAR(QuickTextCtrl::OnChar) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.h b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.h index 01ca641db7..b6cf58338e 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.h +++ b/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.h @@ -31,5 +31,5 @@ public: void OnChar(wxKeyEvent& event); private: - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp b/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp index 4b5558cae2..ab0dc283cb 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp @@ -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 @@ -265,7 +265,7 @@ void MapDialog::SaveFile() EndModal(wxID_OK); } -BEGIN_EVENT_TABLE(MapDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MapDialog, wxDialog) EVT_BUTTON (wxID_CANCEL, MapDialog::OnCancel) EVT_BUTTON (wxID_OPEN, MapDialog::OnOpen) EVT_BUTTON (wxID_SAVE, MapDialog::OnSave) @@ -273,4 +273,4 @@ BEGIN_EVENT_TABLE(MapDialog, wxDialog) EVT_LISTBOX_DCLICK (wxID_ANY, MapDialog::OnListBox) EVT_TEXT (ID_MapDialogFilename, MapDialog::OnFilename) EVT_NOTEBOOK_PAGE_CHANGED (ID_MapDialogNotebook, MapDialog::OnNotebookChanged) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h b/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h index 3e28f870da..5c9334f3cd 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h +++ b/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h @@ -53,7 +53,7 @@ private: wxString m_FileName; MapDialogType m_Type; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; #endif // INCLUDED_MAPDIALOG diff --git a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp index 72aa7f9516..e4a56fe4f5 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp @@ -126,9 +126,9 @@ void MapResizeDialog::OnOK(wxCommandEvent& WXUNUSED(evt)) EndModal(wxID_OK); } -BEGIN_EVENT_TABLE(MapResizeDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MapResizeDialog, wxDialog) EVT_BUTTON(wxID_CANCEL, MapResizeDialog::OnCancel) EVT_BUTTON(wxID_OK, MapResizeDialog::OnOK) EVT_LISTBOX(wxID_ANY, MapResizeDialog::OnListBox) EVT_LISTBOX_DCLICK(wxID_ANY, MapResizeDialog::OnListBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h index f1032ea01c..57f2fc5e96 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h +++ b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h @@ -48,7 +48,7 @@ private: ssize_t m_NewSize; PseudoMiniMapPanel* m_MiniMap; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; #endif // INCLUDED_MAPRESIZEDIALOG diff --git a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp index a37c022361..4b9944769d 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp @@ -228,7 +228,7 @@ void PseudoMiniMapPanel::EraseBackground(wxEraseEvent& WXUNUSED(evt)) // Do nothing - don't erase to remove flicker. } -BEGIN_EVENT_TABLE(PseudoMiniMapPanel, wxPanel) +wxBEGIN_EVENT_TABLE(PseudoMiniMapPanel, wxPanel) EVT_LEAVE_WINDOW(PseudoMiniMapPanel::OnMouseUp) EVT_LEFT_DOWN(PseudoMiniMapPanel::OnMouseDown) EVT_LEFT_UP(PseudoMiniMapPanel::OnMouseUp) @@ -239,4 +239,4 @@ BEGIN_EVENT_TABLE(PseudoMiniMapPanel, wxPanel) EVT_MOTION(PseudoMiniMapPanel::OnMouseMove) EVT_LEAVE_WINDOW(PseudoMiniMapPanel::OnMouseLeave) EVT_PAINT(PseudoMiniMapPanel::PaintEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h index e63de78872..5ca46f68f7 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h +++ b/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h @@ -57,7 +57,7 @@ private: bool m_SameOrGrowing; ssize_t m_NewSize; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; #endif // INCLUDED_PSEUDOMINIMAPPANEL diff --git a/source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.cpp b/source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.cpp index 3e0fa3a4e7..3167c769f8 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.cpp @@ -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 @@ -27,11 +27,11 @@ class wxWindow; -BEGIN_EVENT_TABLE(SnapSplitterWindow, wxSplitterWindow) +wxBEGIN_EVENT_TABLE(SnapSplitterWindow, wxSplitterWindow) EVT_SPLITTER_SASH_POS_CHANGING(wxID_ANY, SnapSplitterWindow::OnSashPosChanging) EVT_SPLITTER_SASH_POS_CHANGED(wxID_ANY, SnapSplitterWindow::OnSashPosChanged) EVT_SPLITTER_DCLICK(wxID_ANY, SnapSplitterWindow::OnDoubleClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() SnapSplitterWindow::SnapSplitterWindow(wxWindow* parent, long style, const wxString& configPath) : wxSplitterWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, diff --git a/source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.h b/source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.h index 3d40e7dc90..9438efe034 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.h +++ b/source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.h @@ -43,5 +43,5 @@ private: int m_SnapTolerance; wxString m_ConfigPath; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp index ea4184cce4..a0a4618e55 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp @@ -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 @@ -48,9 +48,9 @@ class wxWindow; // WDR: event table for wxVirtualDirTreeCtrl -BEGIN_EVENT_TABLE(wxVirtualDirTreeCtrl, wxTreeCtrl) +wxBEGIN_EVENT_TABLE(wxVirtualDirTreeCtrl, wxTreeCtrl) EVT_TREE_ITEM_EXPANDING(-1, wxVirtualDirTreeCtrl::OnExpanding) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() wxVirtualDirTreeCtrl::wxVirtualDirTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) : wxTreeCtrl(parent, id, pos, size, style, validator, name) diff --git a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h index 54e9d752c8..2ba7350e48 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h +++ b/source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h @@ -482,7 +482,7 @@ private: // WDR: handler declarations for wxVirtualDirTreeCtrl private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp index 80f6c7cf4c..e585b2e020 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp @@ -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 @@ -35,10 +35,10 @@ class wxWindow; IMPLEMENT_CLASS(AtlasDialog, wxDialog); -BEGIN_EVENT_TABLE(AtlasDialog, wxDialog) +wxBEGIN_EVENT_TABLE(AtlasDialog, wxDialog) EVT_MENU(wxID_UNDO, AtlasDialog::OnUndo) EVT_MENU(wxID_REDO, AtlasDialog::OnRedo) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() AtlasDialog::AtlasDialog(wxWindow* parent, const wxString& title, const wxSize& size) diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h index 6115dbedec..2fd085a6d4 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h +++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h @@ -51,7 +51,7 @@ protected: private: AtlasWindowCommandProc m_CommandProc; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #endif // INCLUDED_ATLASDIALOG diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp index c1bee79115..dc367a70f2 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp @@ -85,19 +85,19 @@ public: void OnSave(wxCommandEvent& WXUNUSED(event)) { EndModal(wxID_SAVE); } void OnNo(wxCommandEvent& WXUNUSED(event)) { EndModal(wxID_NO); } - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(SaveOnExitDialog, wxDialog) +wxBEGIN_EVENT_TABLE(SaveOnExitDialog, wxDialog) EVT_BUTTON(wxID_SAVE, SaveOnExitDialog::OnSave) EVT_BUTTON(wxID_NO, SaveOnExitDialog::OnNo) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ////////////////////////////////////////////////////////////////////////// IMPLEMENT_CLASS(AtlasWindow, wxFrame); -BEGIN_EVENT_TABLE(AtlasWindow, wxFrame) +wxBEGIN_EVENT_TABLE(AtlasWindow, wxFrame) EVT_MENU(wxID_NEW, AtlasWindow::OnNew) // EVT_MENU(ID_Import, AtlasWindow::OnImport) // EVT_MENU(ID_Export, AtlasWindow::OnExport) @@ -111,7 +111,7 @@ BEGIN_EVENT_TABLE(AtlasWindow, wxFrame) EVT_MENU(wxID_REDO, AtlasWindow::OnRedo) EVT_CLOSE(AtlasWindow::OnClose) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() AtlasWindow::AtlasWindow(wxWindow* parent, const wxString& title, const wxSize& size) : wxFrame(parent, wxID_ANY, _T(""), wxDefaultPosition, size), diff --git a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h index 790e761d0a..1b07e903dc 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h +++ b/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h @@ -97,7 +97,7 @@ private: FileHistory m_FileHistory; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; #endif // INCLUDED_ATLASWINDOW diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp index 4a23e8e210..b5e024d605 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp @@ -329,15 +329,15 @@ private: ScenarioEditor& m_ScenarioEditor; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(GameCanvas, Canvas) +wxBEGIN_EVENT_TABLE(GameCanvas, Canvas) EVT_KEY_DOWN(GameCanvas::OnKeyDown) EVT_KEY_UP(GameCanvas::OnKeyUp) EVT_CHAR(GameCanvas::OnChar) EVT_KILL_FOCUS(GameCanvas::OnKillFocus) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ////////////////////////////////////////////////////////////////////////// @@ -372,7 +372,7 @@ enum ID_Toolbar // must be last in the list }; -BEGIN_EVENT_TABLE(ScenarioEditor, wxFrame) +wxBEGIN_EVENT_TABLE(ScenarioEditor, wxFrame) EVT_CLOSE(ScenarioEditor::OnClose) EVT_TIMER(wxID_ANY, ScenarioEditor::OnTimer) @@ -407,7 +407,7 @@ BEGIN_EVENT_TABLE(ScenarioEditor, wxFrame) EVT_MENU_OPEN(ScenarioEditor::OnMenuOpen) EVT_IDLE(ScenarioEditor::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() static AtlasWindowCommandProc g_CommandProc; AtlasWindowCommandProc& ScenarioEditor::GetCommandProc() { return g_CommandProc; } diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h index 64a17d7e7e..cb37aa2923 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h @@ -120,7 +120,7 @@ private: }; std::map m_HelpData; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; #endif // INCLUDED_SCENARIOEDITOR diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp index dcfb2d0a1f..33c4ce0fe0 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp @@ -79,12 +79,12 @@ private: SidebarBook* m_Book; size_t m_Id; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(SidebarButton, wxBitmapButton) +wxBEGIN_EVENT_TABLE(SidebarButton, wxBitmapButton) EVT_BUTTON(wxID_ANY, SidebarButton::OnClick) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); class SidebarBook : public wxPanel @@ -257,12 +257,12 @@ private: std::vector m_Pages; ssize_t m_SelectedPage; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(SidebarBook, wxPanel) +wxBEGIN_EVENT_TABLE(SidebarBook, wxPanel) EVT_SIZE(SidebarBook::OnSize) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); void SidebarButton::OnClick(wxCommandEvent& WXUNUSED(event)) { diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp index de33788e97..90bc905a90 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp @@ -148,8 +148,8 @@ void CinemaSidebar::ReloadPathList() m_PathList->Append(*path.name); } -BEGIN_EVENT_TABLE(CinemaSidebar, Sidebar) +wxBEGIN_EVENT_TABLE(CinemaSidebar, Sidebar) EVT_CHECKBOX(ID_PathsDrawing, CinemaSidebar::OnTogglePathsDrawing) EVT_BUTTON(ID_AddPath, CinemaSidebar::OnAddPath) EVT_BUTTON(ID_DeletePath, CinemaSidebar::OnDeletePath) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h index 883e8ff3c0..3985171433 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h @@ -47,5 +47,5 @@ private: wxListBox* m_PathList; wxTextCtrl* m_NewPathName; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp index 4f32dfbce8..b32dbce48f 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp @@ -94,12 +94,12 @@ private: Shareable& m_Var; float m_Min, m_Max; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(VariableSliderBox, wxPanel) +wxBEGIN_EVENT_TABLE(VariableSliderBox, wxPanel) EVT_SCROLL(VariableSliderBox::OnScroll) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ////////////////////////////////////////////////////////////////////////// @@ -152,12 +152,12 @@ private: wxComboBox* m_Combo; Shareable& m_Var; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(VariableListBox, wxPanel) +wxBEGIN_EVENT_TABLE(VariableListBox, wxPanel) EVT_COMBOBOX(wxID_ANY, VariableListBox::OnSelect) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ////////////////////////////////////////////////////////////////////////// @@ -216,12 +216,12 @@ private: wxButton* m_Button; Shareable& m_Color; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(VariableColorBox, wxPanel) +wxBEGIN_EVENT_TABLE(VariableColorBox, wxPanel) EVT_BUTTON(wxID_ANY, VariableColorBox::OnClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ////////////////////////////////////////////////////////////////////////// @@ -361,8 +361,8 @@ void EnvironmentSidebar::OnPickWaterHeight(wxCommandEvent& WXUNUSED(evt)) m_ScenarioEditor.GetToolManager().SetCurrentTool(_T("PickWaterHeight"), this); } -BEGIN_EVENT_TABLE(EnvironmentSidebar, Sidebar) +wxBEGIN_EVENT_TABLE(EnvironmentSidebar, Sidebar) EVT_BUTTON(ID_RecomputeWaterData, EnvironmentSidebar::RecomputeWaterData) EVT_BUTTON(ID_PickWaterHeight, EnvironmentSidebar::OnPickWaterHeight) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h index e712c23ecb..fc777b1880 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h @@ -46,5 +46,5 @@ private: VariableListBox* m_WaterTypeList; ObservableScopedConnection m_Conn; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp index 9af1ee4e2c..d5257b5681 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp @@ -150,14 +150,14 @@ public: float theta, phi; LightControl* m_LightControl; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(LightSphere, wxControl) +wxBEGIN_EVENT_TABLE(LightSphere, wxControl) EVT_PAINT(LightSphere::OnPaint) EVT_MOTION(LightSphere::OnMouse) EVT_LEFT_DOWN(LightSphere::OnMouse) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() LightControl::LightControl(wxWindow* parent, const wxSize& size, Observable& environment) : wxPanel(parent), m_Environment(environment) diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp index 132d0b3ae1..63e5a1a691 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp @@ -158,16 +158,16 @@ private: std::vector m_PlayerCivChoices; Observable& m_MapSettings; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(MapSettingsControl, wxPanel) +wxBEGIN_EVENT_TABLE(MapSettingsControl, wxPanel) EVT_TEXT(ID_MapName, MapSettingsControl::OnEdit) EVT_TEXT(ID_MapDescription, MapSettingsControl::OnEdit) EVT_TEXT(ID_MapPreview, MapSettingsControl::OnEdit) EVT_CHECKBOX(wxID_ANY, MapSettingsControl::OnEdit) EVT_CHOICE(wxID_ANY, MapSettingsControl::OnEdit) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); MapSettingsControl::MapSettingsControl(wxWindow* parent, ScenarioEditor& scenarioEditor) : wxPanel(parent, wxID_ANY), m_MapSettings(scenarioEditor.GetMapSettings()) @@ -837,7 +837,7 @@ void MapSidebar::OnResizeMap(wxCommandEvent& WXUNUSED(evt)) POST_COMMAND(ResizeMap, (dlg.GetNewSize(), offset.x, offset.y)); } -BEGIN_EVENT_TABLE(MapSidebar, Sidebar) +wxBEGIN_EVENT_TABLE(MapSidebar, Sidebar) EVT_BUTTON(ID_SimPlay, MapSidebar::OnSimPlay) EVT_BUTTON(ID_SimFast, MapSidebar::OnSimPlay) EVT_BUTTON(ID_SimSlow, MapSidebar::OnSimPlay) @@ -848,4 +848,4 @@ BEGIN_EVENT_TABLE(MapSidebar, Sidebar) EVT_BUTTON(ID_ResizeMap, MapSidebar::OnResizeMap) EVT_BUTTON(ID_OpenPlayerPanel, MapSidebar::OnOpenPlayerPanel) EVT_CHOICE(ID_RandomScript, MapSidebar::OnRandomScript) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h index 50112f0062..1c9551dd3b 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h @@ -48,5 +48,5 @@ private: int m_SimState; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp index 5dcbf64a7a..876c927abf 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp @@ -124,7 +124,7 @@ private: wxScrolledWindow* m_TemplateNames; ObjectSidebarImpl* p; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; struct ObjectSidebarImpl @@ -450,13 +450,13 @@ void ObjectSidebar::OnToggleExactFilter(wxCommandEvent& WXUNUSED(evt)) FilterObjects(); } -BEGIN_EVENT_TABLE(ObjectSidebar, Sidebar) +wxBEGIN_EVENT_TABLE(ObjectSidebar, Sidebar) EVT_CHOICE(ID_ObjectType, ObjectSidebar::OnSelectType) EVT_TEXT(ID_ObjectFilter, ObjectSidebar::OnSelectFilter) EVT_LISTBOX(ID_SelectObject, ObjectSidebar::OnSelectObject) EVT_BUTTON(ID_ToggleViewer, ObjectSidebar::OnToggleViewer) EVT_CHECKBOX(ID_ObjectExactFilter, ObjectSidebar::OnToggleExactFilter) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); ////////////////////////////////////////////////////////////////////////// @@ -525,11 +525,11 @@ private: m_ObjectSettings.NotifyObserversExcept(m_ObjectConn); } - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(PlayerComboBox, wxComboBox) +wxBEGIN_EVENT_TABLE(PlayerComboBox, wxComboBox) EVT_COMBOBOX(wxID_ANY, PlayerComboBox::OnSelect) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); ////////////////////////////////////////////////////////////////////////// @@ -792,7 +792,7 @@ void ObjectBottomBar::OnSpeed(wxCommandEvent& evt) p->ActorViewerPostToGame(); } -BEGIN_EVENT_TABLE(ObjectBottomBar, wxPanel) +wxBEGIN_EVENT_TABLE(ObjectBottomBar, wxPanel) EVT_BUTTON(ID_ViewerWireframe, ObjectBottomBar::OnViewerSetting) EVT_BUTTON(ID_ViewerMove, ObjectBottomBar::OnViewerSetting) EVT_BUTTON(ID_ViewerGround, ObjectBottomBar::OnViewerSetting) @@ -806,4 +806,4 @@ BEGIN_EVENT_TABLE(ObjectBottomBar, wxPanel) EVT_BUTTON(ID_ViewerBoundingBox, ObjectBottomBar::OnViewerSetting) EVT_BUTTON(ID_ViewerAxesMarker, ObjectBottomBar::OnViewerSetting) EVT_BUTTON(ID_ViewerPropPoints, ObjectBottomBar::OnViewerSetting) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h index cb106a2feb..40a5dc0a69 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h @@ -45,5 +45,5 @@ private: std::unique_ptr m_Impl; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp index cb051c54a5..6f8b9fe659 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp @@ -124,12 +124,12 @@ public: private: wxWindow* m_Control; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(DefaultCheckbox, wxCheckBox) +wxBEGIN_EVENT_TABLE(DefaultCheckbox, wxCheckBox) EVT_CHECKBOX(wxID_ANY, DefaultCheckbox::OnChecked) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); class PlayerNotebookPage : public wxPanel @@ -365,15 +365,15 @@ private: PlayerPageControls m_Controls; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(PlayerNotebookPage, wxPanel) +wxBEGIN_EVENT_TABLE(PlayerNotebookPage, wxPanel) EVT_BUTTON(ID_PlayerColor, PlayerNotebookPage::OnColor) EVT_BUTTON(ID_CameraSet, PlayerNotebookPage::OnCameraSet) EVT_BUTTON(ID_CameraView, PlayerNotebookPage::OnCameraView) EVT_BUTTON(ID_CameraClear, PlayerNotebookPage::OnCameraClear) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); ////////////////////////////////////////////////////////////////////////// @@ -440,12 +440,12 @@ protected: private: std::vector m_Pages; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(PlayerNotebook, wxChoicebook) +wxBEGIN_EVENT_TABLE(PlayerNotebook, wxChoicebook) EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, PlayerNotebook::OnPageChanged) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); ////////////////////////////////////////////////////////////////////////// @@ -573,10 +573,10 @@ private: Observable& m_MapSettings; size_t m_NumPlayers; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(PlayerSettingsControl, wxPanel) +wxBEGIN_EVENT_TABLE(PlayerSettingsControl, wxPanel) EVT_BUTTON(ID_PlayerColor, PlayerSettingsControl::OnPlayerColor) EVT_BUTTON(ID_CameraSet, PlayerSettingsControl::OnEdit) EVT_BUTTON(ID_CameraClear, PlayerSettingsControl::OnEdit) @@ -593,7 +593,7 @@ BEGIN_EVENT_TABLE(PlayerSettingsControl, wxPanel) EVT_TEXT_ENTER(ID_PlayerMetal, PlayerSettingsControl::OnEditSpin) EVT_TEXT_ENTER(ID_PlayerStone, PlayerSettingsControl::OnEditSpin) EVT_TEXT_ENTER(ID_PlayerPop, PlayerSettingsControl::OnEditSpin) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); PlayerSettingsControl::PlayerSettingsControl(wxWindow* parent, ScenarioEditor& scenarioEditor) : wxPanel(parent, wxID_ANY), m_InGUIUpdate(false), m_MapSettings(scenarioEditor.GetMapSettings()), m_NumPlayers(0) diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp index f81618768c..31070b0f44 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp @@ -211,12 +211,12 @@ private: wxTimer m_Timer; wxString m_TextureName; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(TexturePreviewPanel, wxPanel) +wxBEGIN_EVENT_TABLE(TexturePreviewPanel, wxPanel) EVT_TIMER(wxID_ANY, TexturePreviewPanel::OnTimer) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); ////////////////////////////////////////////////////////////////////////// @@ -324,10 +324,10 @@ void TerrainSidebar::OnShowPriorities(wxCommandEvent& evt) POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::GAME, L"priorities", evt.IsChecked())); } -BEGIN_EVENT_TABLE(TerrainSidebar, Sidebar) +wxBEGIN_EVENT_TABLE(TerrainSidebar, Sidebar) EVT_CHOICE(ID_Passability, TerrainSidebar::OnPassabilityChoice) EVT_CHECKBOX(ID_ShowPriorities, TerrainSidebar::OnShowPriorities) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); ////////////////////////////////////////////////////////////////////////// @@ -531,14 +531,14 @@ private: }; std::unordered_map m_PreviewButtons; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(TextureNotebookPage, wxPanel) +wxBEGIN_EVENT_TABLE(TextureNotebookPage, wxPanel) EVT_BUTTON(wxID_ANY, TextureNotebookPage::OnButton) EVT_SIZE(TextureNotebookPage::OnSize) EVT_TIMER(wxID_ANY, TextureNotebookPage::OnTimer) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); class TextureNotebook : public wxChoicebook @@ -600,12 +600,12 @@ private: ScenarioEditor& m_ScenarioEditor; wxArrayString m_TerrainGroups; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(TextureNotebook, wxChoicebook) +wxBEGIN_EVENT_TABLE(TextureNotebook, wxChoicebook) EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, TextureNotebook::OnPageChanged) -END_EVENT_TABLE(); +wxEND_EVENT_TABLE(); ////////////////////////////////////////////////////////////////////////// diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h index a06a2f60f5..eb724040e7 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h @@ -41,5 +41,5 @@ private: wxChoice* m_PassabilityChoice; TexturePreviewPanel* m_TexturePreview; - DECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); };