mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-25 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
44 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
+2 -2
View File
@@ -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)
source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h
+1 -1
View File
@@ -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();
};
source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.cpp
+5 -5
View File
@@ -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)
source/tools/atlas/AtlasUI/CustomControls/Buttons/ToolButton.h
+2 -2
View File
@@ -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<int, Button> m_Buttons;
SectionLayout* m_SectionLayout;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.cpp
+3 -3
View File
@@ -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()
source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h
+1 -1
View File
@@ -45,5 +45,5 @@ private:
wxPoint m_LastMousePos;
bool m_MouseCaptured;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.cpp
+3 -3
View File
@@ -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()
source/tools/atlas/AtlasUI/CustomControls/DraggableListCtrl/DraggableListCtrl.h
+1 -1
View File
@@ -61,7 +61,7 @@ public:
private:
long m_DragSource;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
#endif // INCLUDED_DRAGGABLELISTCTRL
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp
+3 -3
View File
@@ -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()
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.h
+1 -1
View File
@@ -116,7 +116,7 @@ protected:
wxListItemAttr m_ListItemAttr[2]; // standard+alternate colors
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
#endif // INCLUDED_EDITABLELISTCTRL
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.cpp
+3 -3
View File
@@ -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()
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickComboBox.h
+1 -1
View File
@@ -32,5 +32,5 @@ public:
void OnChar(wxKeyEvent& event);
private:
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp
+7 -7
View File
@@ -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()
//////////////////////////////////////////////////////////////////////////
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.cpp
+3 -3
View File
@@ -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()
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickTextCtrl.h
+1 -1
View File
@@ -31,5 +31,5 @@ public:
void OnChar(wxKeyEvent& event);
private:
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp
+3 -3
View File
@@ -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()
source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h
+1 -1
View File
@@ -53,7 +53,7 @@ private:
wxString m_FileName;
MapDialogType m_Type;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
#endif // INCLUDED_MAPDIALOG
source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
+2 -2
View File
@@ -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()
source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h
+1 -1
View File
@@ -48,7 +48,7 @@ private:
ssize_t m_NewSize;
PseudoMiniMapPanel* m_MiniMap;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
#endif // INCLUDED_MAPRESIZEDIALOG
source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp
+2 -2
View File
@@ -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()
source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
+1 -1
View File
@@ -57,7 +57,7 @@ private:
bool m_SameOrGrowing;
ssize_t m_NewSize;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
#endif // INCLUDED_PSEUDOMINIMAPPANEL
source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.cpp
+3 -3
View File
@@ -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,
source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.h
+1 -1
View File
@@ -43,5 +43,5 @@ private:
int m_SnapTolerance;
wxString m_ConfigPath;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp
+3 -3
View File
@@ -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)
source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.h
+1 -1
View File
@@ -482,7 +482,7 @@ private:
// WDR: handler declarations for wxVirtualDirTreeCtrl
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
+3 -3
View File
@@ -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)
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.h
+1 -1
View File
@@ -51,7 +51,7 @@ protected:
private:
AtlasWindowCommandProc m_CommandProc;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#endif // INCLUDED_ATLASDIALOG
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
+5 -5
View File
@@ -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),
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h
+1 -1
View File
@@ -97,7 +97,7 @@ private:
FileHistory m_FileHistory;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
#endif // INCLUDED_ATLASWINDOW
source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
+5 -5
View File
@@ -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; }
source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h
+1 -1
View File
@@ -120,7 +120,7 @@ private:
};
std::map<int, HelpItem> m_HelpData;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
#endif // INCLUDED_SCENARIOEDITOR
source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp
+6 -6
View File
@@ -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<SidebarPage> 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))
{
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp
+2 -2
View File
@@ -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();
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h
+1 -1
View File
@@ -47,5 +47,5 @@ private:
wxListBox* m_PathList;
wxTextCtrl* m_NewPathName;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
+11 -11
View File
@@ -94,12 +94,12 @@ private:
Shareable<float>& 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<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)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
//////////////////////////////////////////////////////////////////////////
@@ -216,12 +216,12 @@ private:
wxButton* m_Button;
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)
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();
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h
+1 -1
View File
@@ -46,5 +46,5 @@ private:
VariableListBox* m_WaterTypeList;
ObservableScopedConnection m_Conn;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/LightControl.cpp
+3 -3
View File
@@ -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<AtlasMessage::sEnvironmentSettings>& environment)
: wxPanel(parent), m_Environment(environment)
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
+5 -5
View File
@@ -158,16 +158,16 @@ private:
std::vector<wxChoice*> m_PlayerCivChoices;
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_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()
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h
+1 -1
View File
@@ -48,5 +48,5 @@ private:
int m_SimState;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
+8 -8
View File
@@ -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();
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h
+1 -1
View File
@@ -45,5 +45,5 @@ private:
std::unique_ptr<ObjectSidebarImpl> m_Impl;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
+12 -12
View File
@@ -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<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)
END_EVENT_TABLE();
wxEND_EVENT_TABLE();
//////////////////////////////////////////////////////////////////////////
@@ -573,10 +573,10 @@ private:
Observable<AtObj>& 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)
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
+11 -11
View File
@@ -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<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_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();
//////////////////////////////////////////////////////////////////////////
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h
+1 -1
View File
@@ -41,5 +41,5 @@ private:
wxChoice* m_PassabilityChoice;
TexturePreviewPanel* m_TexturePreview;
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};