dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-08-15 14:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use new WX event macros

Browse source 
Were added in 2010.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2026-07-18 12:04:57 +02:00
parent f1181bada0
commit 2fae39df3b
No known key found for this signature in database
44 changed files with 134 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
View file

@ -50,9 +50,9 @@
class wxWindow; class wxWindow;
BEGIN_EVENT_TABLE(ActorEditor, AtlasWindow) wxBEGIN_EVENT_TABLE(ActorEditor, AtlasWindow)
EVT_MENU(ID_CreateEntity, ActorEditor::OnCreateEntity) EVT_MENU(ID_CreateEntity, ActorEditor::OnCreateEntity)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
ActorEditor::ActorEditor(wxWindow* parent) ActorEditor::ActorEditor(wxWindow* parent)

2
source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h
View file

@ -61,5 +61,5 @@ private:
// but should be persisted so for convenience keep a copy of the last loaded file. // but should be persisted so for convenience keep a copy of the last loaded file.
AtObj m_Actor; AtObj m_Actor;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

10
source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -39,9 +39,9 @@
class wxWindow; class wxWindow;
BEGIN_EVENT_TABLE(ToolButton, wxButton) wxBEGIN_EVENT_TABLE(ToolButton, wxButton)
EVT_BUTTON(wxID_ANY, ToolButton::OnClick) EVT_BUTTON(wxID_ANY, ToolButton::OnClick)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
ToolButton::ToolButton ToolButton::ToolButton
(ToolManager& toolManager, wxWindow *parent, const wxString& label, const wxString& toolName, const wxSize& size, long style) (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) EVT_TOOL(wxID_ANY, ToolButtonBar::OnTool)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
ToolButtonBar::ToolButtonBar(ToolManager& toolManager, wxWindow* parent, SectionLayout* sectionLayout, int baseID, long style) ToolButtonBar::ToolButtonBar(ToolManager& toolManager, wxWindow* parent, SectionLayout* sectionLayout, int baseID, long style)
: wxToolBar(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style) : wxToolBar(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style)

4
source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.h
View file

@ -41,7 +41,7 @@ private:
wxString m_Tool; wxString m_Tool;
bool m_Selected; bool m_Selected;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
class ToolButtonBar : public wxToolBar class ToolButtonBar : public wxToolBar
@ -68,5 +68,5 @@ private:
std::map<int, Button> m_Buttons; std::map<int, Button> m_Buttons;
SectionLayout* m_SectionLayout; SectionLayout* m_SectionLayout;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

6
source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -107,7 +107,7 @@ void Canvas::OnMouse(wxMouseEvent& evt)
HandleMouseEvent(evt); HandleMouseEvent(evt);
} }
BEGIN_EVENT_TABLE(Canvas, wxGLCanvas) wxBEGIN_EVENT_TABLE(Canvas, wxGLCanvas)
EVT_SIZE (Canvas::OnResize) EVT_SIZE (Canvas::OnResize)
EVT_LEFT_DCLICK (Canvas::OnMouse) EVT_LEFT_DCLICK (Canvas::OnMouse)
EVT_LEFT_DOWN (Canvas::OnMouse) EVT_LEFT_DOWN (Canvas::OnMouse)
@ -121,4 +121,4 @@ BEGIN_EVENT_TABLE(Canvas, wxGLCanvas)
EVT_MOUSEWHEEL (Canvas::OnMouse) EVT_MOUSEWHEEL (Canvas::OnMouse)
EVT_MOTION (Canvas::OnMouse) EVT_MOTION (Canvas::OnMouse)
EVT_MOUSE_CAPTURE_LOST(Canvas::OnMouseCaptureLost) EVT_MOUSE_CAPTURE_LOST(Canvas::OnMouseCaptureLost)
END_EVENT_TABLE() wxEND_EVENT_TABLE()

2
source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h
View file

@ -45,5 +45,5 @@ private:
wxPoint m_LastMousePos; wxPoint m_LastMousePos;
bool m_MouseCaptured; bool m_MouseCaptured;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

6
source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 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_BEGIN_DRAG(wxID_ANY, DraggableListCtrl::OnBeginDrag)
EVT_LIST_ITEM_SELECTED(wxID_ANY, DraggableListCtrl::OnItemSelected) EVT_LIST_ITEM_SELECTED(wxID_ANY, DraggableListCtrl::OnItemSelected)
EVT_MOTION(DraggableListCtrl::OnMouseEvent) EVT_MOTION(DraggableListCtrl::OnMouseEvent)
EVT_LEFT_UP(DraggableListCtrl::OnMouseEvent) EVT_LEFT_UP(DraggableListCtrl::OnMouseEvent)
EVT_CHAR(DraggableListCtrl::OnChar) EVT_CHAR(DraggableListCtrl::OnChar)
EVT_MOUSE_CAPTURE_LOST(DraggableListCtrl::OnMouseCaptureLost) EVT_MOUSE_CAPTURE_LOST(DraggableListCtrl::OnMouseCaptureLost)
END_EVENT_TABLE() wxEND_EVENT_TABLE()

2
source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h
View file

@ -61,7 +61,7 @@ public:
private: private:
long m_DragSource; long m_DragSource;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#endif // INCLUDED_DRAGGABLELISTCTRL #endif // INCLUDED_DRAGGABLELISTCTRL

6
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 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_LEFT_DCLICK(EditableListCtrl::OnMouseEvent)
EVT_RIGHT_DOWN(EditableListCtrl::OnMouseEvent) EVT_RIGHT_DOWN(EditableListCtrl::OnMouseEvent)
EVT_CHAR(EditableListCtrl::OnKeyDown) EVT_CHAR(EditableListCtrl::OnKeyDown)
END_EVENT_TABLE() wxEND_EVENT_TABLE()

2
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h
View file

@ -116,7 +116,7 @@ protected:
wxListItemAttr m_ListItemAttr[2]; // standard+alternate colors wxListItemAttr m_ListItemAttr[2]; // standard+alternate colors
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#endif // INCLUDED_EDITABLELISTCTRL #endif // INCLUDED_EDITABLELISTCTRL

6
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -67,7 +67,7 @@ void QuickComboBox::OnChar(wxKeyEvent& event)
event.Skip(); event.Skip();
} }
BEGIN_EVENT_TABLE(QuickComboBox, wxComboBox) wxBEGIN_EVENT_TABLE(QuickComboBox, wxComboBox)
EVT_KILL_FOCUS(QuickComboBox::OnKillFocus) EVT_KILL_FOCUS(QuickComboBox::OnKillFocus)
EVT_CHAR(QuickComboBox::OnChar) EVT_CHAR(QuickComboBox::OnChar)
END_EVENT_TABLE() wxEND_EVENT_TABLE()

2
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.h
View file

@ -32,5 +32,5 @@ public:
void OnChar(wxKeyEvent& event); void OnChar(wxKeyEvent& event);
private: private:
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

14
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -79,13 +79,13 @@ public:
event.Skip(); 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_KILL_FOCUS(FileCtrl_TextCtrl::OnKillFocus)
EVT_CHAR(FileCtrl_TextCtrl::OnChar) EVT_CHAR(FileCtrl_TextCtrl::OnChar)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
class FileCtrl_Button : public wxButton class FileCtrl_Button : public wxButton
{ {
@ -105,13 +105,13 @@ public:
virtual void OnPress(wxCommandEvent& event)=0; 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_KILL_FOCUS(FileCtrl_Button::OnKillFocus)
EVT_BUTTON(wxID_ANY, FileCtrl_Button::OnPress) EVT_BUTTON(wxID_ANY, FileCtrl_Button::OnPress)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////

6
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -58,7 +58,7 @@ void QuickTextCtrl::OnChar(wxKeyEvent& event)
event.Skip(); event.Skip();
} }
BEGIN_EVENT_TABLE(QuickTextCtrl, wxTextCtrl) wxBEGIN_EVENT_TABLE(QuickTextCtrl, wxTextCtrl)
EVT_KILL_FOCUS(QuickTextCtrl::OnKillFocus) EVT_KILL_FOCUS(QuickTextCtrl::OnKillFocus)
EVT_CHAR(QuickTextCtrl::OnChar) EVT_CHAR(QuickTextCtrl::OnChar)
END_EVENT_TABLE() wxEND_EVENT_TABLE()

2
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.h
View file

@ -31,5 +31,5 @@ public:
void OnChar(wxKeyEvent& event); void OnChar(wxKeyEvent& event);
private: private:
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

6
source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -265,7 +265,7 @@ void MapDialog::SaveFile()
EndModal(wxID_OK); EndModal(wxID_OK);
} }
BEGIN_EVENT_TABLE(MapDialog, wxDialog) wxBEGIN_EVENT_TABLE(MapDialog, wxDialog)
EVT_BUTTON (wxID_CANCEL, MapDialog::OnCancel) EVT_BUTTON (wxID_CANCEL, MapDialog::OnCancel)
EVT_BUTTON (wxID_OPEN, MapDialog::OnOpen) EVT_BUTTON (wxID_OPEN, MapDialog::OnOpen)
EVT_BUTTON (wxID_SAVE, MapDialog::OnSave) EVT_BUTTON (wxID_SAVE, MapDialog::OnSave)
@ -273,4 +273,4 @@ BEGIN_EVENT_TABLE(MapDialog, wxDialog)
EVT_LISTBOX_DCLICK (wxID_ANY, MapDialog::OnListBox) EVT_LISTBOX_DCLICK (wxID_ANY, MapDialog::OnListBox)
EVT_TEXT (ID_MapDialogFilename, MapDialog::OnFilename) EVT_TEXT (ID_MapDialogFilename, MapDialog::OnFilename)
EVT_NOTEBOOK_PAGE_CHANGED (ID_MapDialogNotebook, MapDialog::OnNotebookChanged) EVT_NOTEBOOK_PAGE_CHANGED (ID_MapDialogNotebook, MapDialog::OnNotebookChanged)
END_EVENT_TABLE() wxEND_EVENT_TABLE()

2
source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h
View file

@ -53,7 +53,7 @@ private:
wxString m_FileName; wxString m_FileName;
MapDialogType m_Type; MapDialogType m_Type;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#endif // INCLUDED_MAPDIALOG #endif // INCLUDED_MAPDIALOG

4
source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
View file

@ -126,9 +126,9 @@ void MapResizeDialog::OnOK(wxCommandEvent& WXUNUSED(evt))
EndModal(wxID_OK); EndModal(wxID_OK);
} }
BEGIN_EVENT_TABLE(MapResizeDialog, wxDialog) wxBEGIN_EVENT_TABLE(MapResizeDialog, wxDialog)
EVT_BUTTON(wxID_CANCEL, MapResizeDialog::OnCancel) EVT_BUTTON(wxID_CANCEL, MapResizeDialog::OnCancel)
EVT_BUTTON(wxID_OK, MapResizeDialog::OnOK) EVT_BUTTON(wxID_OK, MapResizeDialog::OnOK)
EVT_LISTBOX(wxID_ANY, MapResizeDialog::OnListBox) EVT_LISTBOX(wxID_ANY, MapResizeDialog::OnListBox)
EVT_LISTBOX_DCLICK(wxID_ANY, MapResizeDialog::OnListBox) EVT_LISTBOX_DCLICK(wxID_ANY, MapResizeDialog::OnListBox)
END_EVENT_TABLE() wxEND_EVENT_TABLE()

2
source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h
View file

@ -48,7 +48,7 @@ private:
ssize_t m_NewSize; ssize_t m_NewSize;
PseudoMiniMapPanel* m_MiniMap; PseudoMiniMapPanel* m_MiniMap;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#endif // INCLUDED_MAPRESIZEDIALOG #endif // INCLUDED_MAPRESIZEDIALOG

4
source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp
View file

@ -228,7 +228,7 @@ void PseudoMiniMapPanel::EraseBackground(wxEraseEvent& WXUNUSED(evt))
// Do nothing - don't erase to remove flicker. // Do nothing - don't erase to remove flicker.
} }
BEGIN_EVENT_TABLE(PseudoMiniMapPanel, wxPanel) wxBEGIN_EVENT_TABLE(PseudoMiniMapPanel, wxPanel)
EVT_LEAVE_WINDOW(PseudoMiniMapPanel::OnMouseUp) EVT_LEAVE_WINDOW(PseudoMiniMapPanel::OnMouseUp)
EVT_LEFT_DOWN(PseudoMiniMapPanel::OnMouseDown) EVT_LEFT_DOWN(PseudoMiniMapPanel::OnMouseDown)
EVT_LEFT_UP(PseudoMiniMapPanel::OnMouseUp) EVT_LEFT_UP(PseudoMiniMapPanel::OnMouseUp)
@ -239,4 +239,4 @@ BEGIN_EVENT_TABLE(PseudoMiniMapPanel, wxPanel)
EVT_MOTION(PseudoMiniMapPanel::OnMouseMove) EVT_MOTION(PseudoMiniMapPanel::OnMouseMove)
EVT_LEAVE_WINDOW(PseudoMiniMapPanel::OnMouseLeave) EVT_LEAVE_WINDOW(PseudoMiniMapPanel::OnMouseLeave)
EVT_PAINT(PseudoMiniMapPanel::PaintEvent) EVT_PAINT(PseudoMiniMapPanel::PaintEvent)
END_EVENT_TABLE() wxEND_EVENT_TABLE()

2
source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
View file

@ -57,7 +57,7 @@ private:
bool m_SameOrGrowing; bool m_SameOrGrowing;
ssize_t m_NewSize; ssize_t m_NewSize;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#endif // INCLUDED_PSEUDOMINIMAPPANEL #endif // INCLUDED_PSEUDOMINIMAPPANEL

6
source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -27,11 +27,11 @@
class wxWindow; 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_CHANGING(wxID_ANY, SnapSplitterWindow::OnSashPosChanging)
EVT_SPLITTER_SASH_POS_CHANGED(wxID_ANY, SnapSplitterWindow::OnSashPosChanged) EVT_SPLITTER_SASH_POS_CHANGED(wxID_ANY, SnapSplitterWindow::OnSashPosChanged)
EVT_SPLITTER_DCLICK(wxID_ANY, SnapSplitterWindow::OnDoubleClick) EVT_SPLITTER_DCLICK(wxID_ANY, SnapSplitterWindow::OnDoubleClick)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
SnapSplitterWindow::SnapSplitterWindow(wxWindow* parent, long style, const wxString& configPath) SnapSplitterWindow::SnapSplitterWindow(wxWindow* parent, long style, const wxString& configPath)
: wxSplitterWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, : wxSplitterWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,

2
source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.h
View file

@ -43,5 +43,5 @@ private:
int m_SnapTolerance; int m_SnapTolerance;
wxString m_ConfigPath; wxString m_ConfigPath;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

6
source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -48,9 +48,9 @@ class wxWindow;
// WDR: event table for wxVirtualDirTreeCtrl // WDR: event table for wxVirtualDirTreeCtrl
BEGIN_EVENT_TABLE(wxVirtualDirTreeCtrl, wxTreeCtrl) wxBEGIN_EVENT_TABLE(wxVirtualDirTreeCtrl, wxTreeCtrl)
EVT_TREE_ITEM_EXPANDING(-1, wxVirtualDirTreeCtrl::OnExpanding) 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) 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) : wxTreeCtrl(parent, id, pos, size, style, validator, name)

2
source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h
View file

@ -482,7 +482,7 @@ private:
// WDR: handler declarations for wxVirtualDirTreeCtrl // WDR: handler declarations for wxVirtualDirTreeCtrl
private: private:
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
}; };

6
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games. /* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -35,10 +35,10 @@ class wxWindow;
IMPLEMENT_CLASS(AtlasDialog, wxDialog); IMPLEMENT_CLASS(AtlasDialog, wxDialog);
BEGIN_EVENT_TABLE(AtlasDialog, wxDialog) wxBEGIN_EVENT_TABLE(AtlasDialog, wxDialog)
EVT_MENU(wxID_UNDO, AtlasDialog::OnUndo) EVT_MENU(wxID_UNDO, AtlasDialog::OnUndo)
EVT_MENU(wxID_REDO, AtlasDialog::OnRedo) EVT_MENU(wxID_REDO, AtlasDialog::OnRedo)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
AtlasDialog::AtlasDialog(wxWindow* parent, const wxString& title, const wxSize& size) AtlasDialog::AtlasDialog(wxWindow* parent, const wxString& title, const wxSize& size)

2
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
View file

@ -51,7 +51,7 @@ protected:
private: private:
AtlasWindowCommandProc m_CommandProc; AtlasWindowCommandProc m_CommandProc;
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
}; };
#endif // INCLUDED_ATLASDIALOG #endif // INCLUDED_ATLASDIALOG

10
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
View file

@ -85,19 +85,19 @@ public:
void OnSave(wxCommandEvent& WXUNUSED(event)) { EndModal(wxID_SAVE); } void OnSave(wxCommandEvent& WXUNUSED(event)) { EndModal(wxID_SAVE); }
void OnNo(wxCommandEvent& WXUNUSED(event)) { EndModal(wxID_NO); } 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_SAVE, SaveOnExitDialog::OnSave)
EVT_BUTTON(wxID_NO, SaveOnExitDialog::OnNo) EVT_BUTTON(wxID_NO, SaveOnExitDialog::OnNo)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
IMPLEMENT_CLASS(AtlasWindow, wxFrame); IMPLEMENT_CLASS(AtlasWindow, wxFrame);
BEGIN_EVENT_TABLE(AtlasWindow, wxFrame) wxBEGIN_EVENT_TABLE(AtlasWindow, wxFrame)
EVT_MENU(wxID_NEW, AtlasWindow::OnNew) EVT_MENU(wxID_NEW, AtlasWindow::OnNew)
// EVT_MENU(ID_Import, AtlasWindow::OnImport) // EVT_MENU(ID_Import, AtlasWindow::OnImport)
// EVT_MENU(ID_Export, AtlasWindow::OnExport) // EVT_MENU(ID_Export, AtlasWindow::OnExport)
@ -111,7 +111,7 @@ BEGIN_EVENT_TABLE(AtlasWindow, wxFrame)
EVT_MENU(wxID_REDO, AtlasWindow::OnRedo) EVT_MENU(wxID_REDO, AtlasWindow::OnRedo)
EVT_CLOSE(AtlasWindow::OnClose) EVT_CLOSE(AtlasWindow::OnClose)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
AtlasWindow::AtlasWindow(wxWindow* parent, const wxString& title, const wxSize& size) AtlasWindow::AtlasWindow(wxWindow* parent, const wxString& title, const wxSize& size)
: wxFrame(parent, wxID_ANY, _T(""), wxDefaultPosition, size), : wxFrame(parent, wxID_ANY, _T(""), wxDefaultPosition, size),

2
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
View file

@ -97,7 +97,7 @@ private:
FileHistory m_FileHistory; FileHistory m_FileHistory;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#endif // INCLUDED_ATLASWINDOW #endif // INCLUDED_ATLASWINDOW

10
source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
View file

@ -329,15 +329,15 @@ private:
ScenarioEditor& m_ScenarioEditor; 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_DOWN(GameCanvas::OnKeyDown)
EVT_KEY_UP(GameCanvas::OnKeyUp) EVT_KEY_UP(GameCanvas::OnKeyUp)
EVT_CHAR(GameCanvas::OnChar) EVT_CHAR(GameCanvas::OnChar)
EVT_KILL_FOCUS(GameCanvas::OnKillFocus) EVT_KILL_FOCUS(GameCanvas::OnKillFocus)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -372,7 +372,7 @@ enum
ID_Toolbar // must be last in the list ID_Toolbar // must be last in the list
}; };
BEGIN_EVENT_TABLE(ScenarioEditor, wxFrame) wxBEGIN_EVENT_TABLE(ScenarioEditor, wxFrame)
EVT_CLOSE(ScenarioEditor::OnClose) EVT_CLOSE(ScenarioEditor::OnClose)
EVT_TIMER(wxID_ANY, ScenarioEditor::OnTimer) EVT_TIMER(wxID_ANY, ScenarioEditor::OnTimer)
@ -407,7 +407,7 @@ BEGIN_EVENT_TABLE(ScenarioEditor, wxFrame)
EVT_MENU_OPEN(ScenarioEditor::OnMenuOpen) EVT_MENU_OPEN(ScenarioEditor::OnMenuOpen)
EVT_IDLE(ScenarioEditor::OnIdle) EVT_IDLE(ScenarioEditor::OnIdle)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
static AtlasWindowCommandProc g_CommandProc; static AtlasWindowCommandProc g_CommandProc;
AtlasWindowCommandProc& ScenarioEditor::GetCommandProc() { return g_CommandProc; } AtlasWindowCommandProc& ScenarioEditor::GetCommandProc() { return g_CommandProc; }

2
source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h
View file

@ -120,7 +120,7 @@ private:
}; };
std::map<int, HelpItem> m_HelpData; std::map<int, HelpItem> m_HelpData;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#endif // INCLUDED_SCENARIOEDITOR #endif // INCLUDED_SCENARIOEDITOR

12
source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp
View file

@ -79,12 +79,12 @@ private:
SidebarBook* m_Book; SidebarBook* m_Book;
size_t m_Id; 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) EVT_BUTTON(wxID_ANY, SidebarButton::OnClick)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
class SidebarBook : public wxPanel class SidebarBook : public wxPanel
@ -257,12 +257,12 @@ private:
std::vector<SidebarPage> m_Pages; std::vector<SidebarPage> m_Pages;
ssize_t m_SelectedPage; ssize_t m_SelectedPage;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
BEGIN_EVENT_TABLE(SidebarBook, wxPanel) wxBEGIN_EVENT_TABLE(SidebarBook, wxPanel)
EVT_SIZE(SidebarBook::OnSize) EVT_SIZE(SidebarBook::OnSize)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
void SidebarButton::OnClick(wxCommandEvent& WXUNUSED(event)) void SidebarButton::OnClick(wxCommandEvent& WXUNUSED(event))
{ {

4
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp
View file

@ -148,8 +148,8 @@ void CinemaSidebar::ReloadPathList()
m_PathList->Append(*path.name); m_PathList->Append(*path.name);
} }
BEGIN_EVENT_TABLE(CinemaSidebar, Sidebar) wxBEGIN_EVENT_TABLE(CinemaSidebar, Sidebar)
EVT_CHECKBOX(ID_PathsDrawing, CinemaSidebar::OnTogglePathsDrawing) EVT_CHECKBOX(ID_PathsDrawing, CinemaSidebar::OnTogglePathsDrawing)
EVT_BUTTON(ID_AddPath, CinemaSidebar::OnAddPath) EVT_BUTTON(ID_AddPath, CinemaSidebar::OnAddPath)
EVT_BUTTON(ID_DeletePath, CinemaSidebar::OnDeletePath) EVT_BUTTON(ID_DeletePath, CinemaSidebar::OnDeletePath)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h
View file

@ -47,5 +47,5 @@ private:
wxListBox* m_PathList; wxListBox* m_PathList;
wxTextCtrl* m_NewPathName; wxTextCtrl* m_NewPathName;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

22
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
View file

@ -94,12 +94,12 @@ private:
Shareable<float>& m_Var; Shareable<float>& m_Var;
float m_Min, m_Max; 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) EVT_SCROLL(VariableSliderBox::OnScroll)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -152,12 +152,12 @@ private:
wxComboBox* m_Combo; wxComboBox* m_Combo;
Shareable<std::wstring>& m_Var; Shareable<std::wstring>& m_Var;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
BEGIN_EVENT_TABLE(VariableListBox, wxPanel) wxBEGIN_EVENT_TABLE(VariableListBox, wxPanel)
EVT_COMBOBOX(wxID_ANY, VariableListBox::OnSelect) EVT_COMBOBOX(wxID_ANY, VariableListBox::OnSelect)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -216,12 +216,12 @@ private:
wxButton* m_Button; wxButton* m_Button;
Shareable<AtlasMessage::Color>& m_Color; Shareable<AtlasMessage::Color>& m_Color;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
BEGIN_EVENT_TABLE(VariableColorBox, wxPanel) wxBEGIN_EVENT_TABLE(VariableColorBox, wxPanel)
EVT_BUTTON(wxID_ANY, VariableColorBox::OnClick) 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); 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_RecomputeWaterData, EnvironmentSidebar::RecomputeWaterData)
EVT_BUTTON(ID_PickWaterHeight, EnvironmentSidebar::OnPickWaterHeight) EVT_BUTTON(ID_PickWaterHeight, EnvironmentSidebar::OnPickWaterHeight)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h
View file

@ -46,5 +46,5 @@ private:
VariableListBox* m_WaterTypeList; VariableListBox* m_WaterTypeList;
ObservableScopedConnection m_Conn; ObservableScopedConnection m_Conn;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

6
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp
View file

@ -150,14 +150,14 @@ public:
float theta, phi; float theta, phi;
LightControl* m_LightControl; LightControl* m_LightControl;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
BEGIN_EVENT_TABLE(LightSphere, wxControl) wxBEGIN_EVENT_TABLE(LightSphere, wxControl)
EVT_PAINT(LightSphere::OnPaint) EVT_PAINT(LightSphere::OnPaint)
EVT_MOTION(LightSphere::OnMouse) EVT_MOTION(LightSphere::OnMouse)
EVT_LEFT_DOWN(LightSphere::OnMouse) EVT_LEFT_DOWN(LightSphere::OnMouse)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
LightControl::LightControl(wxWindow* parent, const wxSize& size, Observable<AtlasMessage::sEnvironmentSettings>& environment) LightControl::LightControl(wxWindow* parent, const wxSize& size, Observable<AtlasMessage::sEnvironmentSettings>& environment)
: wxPanel(parent), m_Environment(environment) : wxPanel(parent), m_Environment(environment)

10
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
View file

@ -158,16 +158,16 @@ private:
std::vector<wxChoice*> m_PlayerCivChoices; std::vector<wxChoice*> m_PlayerCivChoices;
Observable<AtObj>& m_MapSettings; Observable<AtObj>& 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_MapName, MapSettingsControl::OnEdit)
EVT_TEXT(ID_MapDescription, MapSettingsControl::OnEdit) EVT_TEXT(ID_MapDescription, MapSettingsControl::OnEdit)
EVT_TEXT(ID_MapPreview, MapSettingsControl::OnEdit) EVT_TEXT(ID_MapPreview, MapSettingsControl::OnEdit)
EVT_CHECKBOX(wxID_ANY, MapSettingsControl::OnEdit) EVT_CHECKBOX(wxID_ANY, MapSettingsControl::OnEdit)
EVT_CHOICE(wxID_ANY, MapSettingsControl::OnEdit) EVT_CHOICE(wxID_ANY, MapSettingsControl::OnEdit)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
MapSettingsControl::MapSettingsControl(wxWindow* parent, ScenarioEditor& scenarioEditor) MapSettingsControl::MapSettingsControl(wxWindow* parent, ScenarioEditor& scenarioEditor)
: wxPanel(parent, wxID_ANY), m_MapSettings(scenarioEditor.GetMapSettings()) : 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)); 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_SimPlay, MapSidebar::OnSimPlay)
EVT_BUTTON(ID_SimFast, MapSidebar::OnSimPlay) EVT_BUTTON(ID_SimFast, MapSidebar::OnSimPlay)
EVT_BUTTON(ID_SimSlow, 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_ResizeMap, MapSidebar::OnResizeMap)
EVT_BUTTON(ID_OpenPlayerPanel, MapSidebar::OnOpenPlayerPanel) EVT_BUTTON(ID_OpenPlayerPanel, MapSidebar::OnOpenPlayerPanel)
EVT_CHOICE(ID_RandomScript, MapSidebar::OnRandomScript) EVT_CHOICE(ID_RandomScript, MapSidebar::OnRandomScript)
END_EVENT_TABLE() wxEND_EVENT_TABLE()

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h
View file

@ -48,5 +48,5 @@ private:
int m_SimState; int m_SimState;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

16
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
View file

@ -124,7 +124,7 @@ private:
wxScrolledWindow* m_TemplateNames; wxScrolledWindow* m_TemplateNames;
ObjectSidebarImpl* p; ObjectSidebarImpl* p;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
struct ObjectSidebarImpl struct ObjectSidebarImpl
@ -450,13 +450,13 @@ void ObjectSidebar::OnToggleExactFilter(wxCommandEvent& WXUNUSED(evt))
FilterObjects(); FilterObjects();
} }
BEGIN_EVENT_TABLE(ObjectSidebar, Sidebar) wxBEGIN_EVENT_TABLE(ObjectSidebar, Sidebar)
EVT_CHOICE(ID_ObjectType, ObjectSidebar::OnSelectType) EVT_CHOICE(ID_ObjectType, ObjectSidebar::OnSelectType)
EVT_TEXT(ID_ObjectFilter, ObjectSidebar::OnSelectFilter) EVT_TEXT(ID_ObjectFilter, ObjectSidebar::OnSelectFilter)
EVT_LISTBOX(ID_SelectObject, ObjectSidebar::OnSelectObject) EVT_LISTBOX(ID_SelectObject, ObjectSidebar::OnSelectObject)
EVT_BUTTON(ID_ToggleViewer, ObjectSidebar::OnToggleViewer) EVT_BUTTON(ID_ToggleViewer, ObjectSidebar::OnToggleViewer)
EVT_CHECKBOX(ID_ObjectExactFilter, ObjectSidebar::OnToggleExactFilter) EVT_CHECKBOX(ID_ObjectExactFilter, ObjectSidebar::OnToggleExactFilter)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -525,11 +525,11 @@ private:
m_ObjectSettings.NotifyObserversExcept(m_ObjectConn); 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) EVT_COMBOBOX(wxID_ANY, PlayerComboBox::OnSelect)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -792,7 +792,7 @@ void ObjectBottomBar::OnSpeed(wxCommandEvent& evt)
p->ActorViewerPostToGame(); p->ActorViewerPostToGame();
} }
BEGIN_EVENT_TABLE(ObjectBottomBar, wxPanel) wxBEGIN_EVENT_TABLE(ObjectBottomBar, wxPanel)
EVT_BUTTON(ID_ViewerWireframe, ObjectBottomBar::OnViewerSetting) EVT_BUTTON(ID_ViewerWireframe, ObjectBottomBar::OnViewerSetting)
EVT_BUTTON(ID_ViewerMove, ObjectBottomBar::OnViewerSetting) EVT_BUTTON(ID_ViewerMove, ObjectBottomBar::OnViewerSetting)
EVT_BUTTON(ID_ViewerGround, 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_ViewerBoundingBox, ObjectBottomBar::OnViewerSetting)
EVT_BUTTON(ID_ViewerAxesMarker, ObjectBottomBar::OnViewerSetting) EVT_BUTTON(ID_ViewerAxesMarker, ObjectBottomBar::OnViewerSetting)
EVT_BUTTON(ID_ViewerPropPoints, ObjectBottomBar::OnViewerSetting) EVT_BUTTON(ID_ViewerPropPoints, ObjectBottomBar::OnViewerSetting)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h
View file

@ -45,5 +45,5 @@ private:
std::unique_ptr<ObjectSidebarImpl> m_Impl; std::unique_ptr<ObjectSidebarImpl> m_Impl;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

24
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
View file

@ -124,12 +124,12 @@ public:
private: private:
wxWindow* m_Control; 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) EVT_CHECKBOX(wxID_ANY, DefaultCheckbox::OnChecked)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
class PlayerNotebookPage : public wxPanel class PlayerNotebookPage : public wxPanel
@ -365,15 +365,15 @@ private:
PlayerPageControls m_Controls; 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_PlayerColor, PlayerNotebookPage::OnColor)
EVT_BUTTON(ID_CameraSet, PlayerNotebookPage::OnCameraSet) EVT_BUTTON(ID_CameraSet, PlayerNotebookPage::OnCameraSet)
EVT_BUTTON(ID_CameraView, PlayerNotebookPage::OnCameraView) EVT_BUTTON(ID_CameraView, PlayerNotebookPage::OnCameraView)
EVT_BUTTON(ID_CameraClear, PlayerNotebookPage::OnCameraClear) EVT_BUTTON(ID_CameraClear, PlayerNotebookPage::OnCameraClear)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -440,12 +440,12 @@ protected:
private: private:
std::vector<PlayerNotebookPage*> m_Pages; std::vector<PlayerNotebookPage*> 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) EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, PlayerNotebook::OnPageChanged)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -573,10 +573,10 @@ private:
Observable<AtObj>& m_MapSettings; Observable<AtObj>& m_MapSettings;
size_t m_NumPlayers; 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_PlayerColor, PlayerSettingsControl::OnPlayerColor)
EVT_BUTTON(ID_CameraSet, PlayerSettingsControl::OnEdit) EVT_BUTTON(ID_CameraSet, PlayerSettingsControl::OnEdit)
EVT_BUTTON(ID_CameraClear, 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_PlayerMetal, PlayerSettingsControl::OnEditSpin)
EVT_TEXT_ENTER(ID_PlayerStone, PlayerSettingsControl::OnEditSpin) EVT_TEXT_ENTER(ID_PlayerStone, PlayerSettingsControl::OnEditSpin)
EVT_TEXT_ENTER(ID_PlayerPop, PlayerSettingsControl::OnEditSpin) EVT_TEXT_ENTER(ID_PlayerPop, PlayerSettingsControl::OnEditSpin)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
PlayerSettingsControl::PlayerSettingsControl(wxWindow* parent, ScenarioEditor& scenarioEditor) PlayerSettingsControl::PlayerSettingsControl(wxWindow* parent, ScenarioEditor& scenarioEditor)
: wxPanel(parent, wxID_ANY), m_InGUIUpdate(false), m_MapSettings(scenarioEditor.GetMapSettings()), m_NumPlayers(0) : wxPanel(parent, wxID_ANY), m_InGUIUpdate(false), m_MapSettings(scenarioEditor.GetMapSettings()), m_NumPlayers(0)

22
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
View file

@ -211,12 +211,12 @@ private:
wxTimer m_Timer; wxTimer m_Timer;
wxString m_TextureName; 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) 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())); 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_CHOICE(ID_Passability, TerrainSidebar::OnPassabilityChoice)
EVT_CHECKBOX(ID_ShowPriorities, TerrainSidebar::OnShowPriorities) EVT_CHECKBOX(ID_ShowPriorities, TerrainSidebar::OnShowPriorities)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -531,14 +531,14 @@ private:
}; };
std::unordered_map<std::wstring, PreviewButton> m_PreviewButtons; std::unordered_map<std::wstring, PreviewButton> 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_BUTTON(wxID_ANY, TextureNotebookPage::OnButton)
EVT_SIZE(TextureNotebookPage::OnSize) EVT_SIZE(TextureNotebookPage::OnSize)
EVT_TIMER(wxID_ANY, TextureNotebookPage::OnTimer) EVT_TIMER(wxID_ANY, TextureNotebookPage::OnTimer)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
class TextureNotebook : public wxChoicebook class TextureNotebook : public wxChoicebook
@ -600,12 +600,12 @@ private:
ScenarioEditor& m_ScenarioEditor; ScenarioEditor& m_ScenarioEditor;
wxArrayString m_TerrainGroups; 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) EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, TextureNotebook::OnPageChanged)
END_EVENT_TABLE(); wxEND_EVENT_TABLE();
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h
View file

@ -41,5 +41,5 @@ private:
wxChoice* m_PassabilityChoice; wxChoice* m_PassabilityChoice;
TexturePreviewPanel* m_TexturePreview; TexturePreviewPanel* m_TexturePreview;
DECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };