diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2018-10-03 12:34:39 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2018-10-03 12:51:47 +0300 |
| commit | 770d944283cda7c90ea7aa614be824aaa3de3519 (patch) | |
| tree | 8e9138efcc080ec42d34382e0586ef4cc191bf5a /src/slic3r/GUI/GLToolbar.cpp | |
| parent | e9d26d1a8efdbff8d422c2ea109d886f3da6cfd6 (diff) | |
Replace PerlCallbacks with events in GLCanvas3d et al.
Diffstat (limited to 'src/slic3r/GUI/GLToolbar.cpp')
| -rw-r--r-- | src/slic3r/GUI/GLToolbar.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp index 196dc663f..e1566e944 100644 --- a/src/slic3r/GUI/GLToolbar.cpp +++ b/src/slic3r/GUI/GLToolbar.cpp @@ -16,9 +16,18 @@ namespace Slic3r { namespace GUI { -wxDEFINE_EVENT(EVT_GLTOOLBAR_ADD, wxCommandEvent); -wxDEFINE_EVENT(EVT_GLTOOLBAR_DELETE, wxCommandEvent); -wxDEFINE_EVENT(EVT_GLTOOLBAR_TODO_MORE, wxCommandEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_ADD, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_DELETE, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_DELETE_ALL, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_ARRANGE, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_MORE, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_FEWER, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_SPLIT, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_CUT, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_SETTINGS, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_LAYERSEDITING, SimpleEvent); +wxDEFINE_EVENT(EVT_GLTOOLBAR_SELECTBYPARTS, SimpleEvent); + GLToolbarItem::Data::Data() : name("") @@ -57,10 +66,7 @@ const std::string& GLToolbarItem::get_tooltip() const void GLToolbarItem::do_action(wxEvtHandler *target) { - // if (m_data.action_callback != nullptr) - // m_data.action_callback->call(); - - wxPostEvent(target, wxCommandEvent(m_data.action_event)); + wxPostEvent(target, SimpleEvent(m_data.action_event)); } bool GLToolbarItem::is_enabled() const |