3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Replace PerlCallbacks with events in GLCanvas3d et al.

Browse source
This commit is contained in:
Vojtech Kral 2018-10-03 11:34:39 +02:00
parent e9d26d1a8e
commit 770d944283
14 changed files with 197 additions and 933 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/slic3r/GUI/GLToolbar.hpp
View file

@ -5,10 +5,9 @@
#include <string>
#include <vector>
#include <wx/event.h>
#include "GLTexture.hpp"
#include "Event.hpp"
#include "../../slic3r/GUI/GLTexture.hpp"
// #include "callback.hpp"
class wxEvtHandler;
@ -17,9 +16,17 @@ namespace GUI {
class GLCanvas3D;
wxDECLARE_EVENT(EVT_GLTOOLBAR_ADD, wxCommandEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_DELETE, wxCommandEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_TODO_MORE, wxCommandEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_ADD, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_DELETE, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_DELETE_ALL, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_ARRANGE, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_MORE, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_FEWER, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_SPLIT, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_CUT, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_SETTINGS, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_LAYERSEDITING, SimpleEvent);
wxDECLARE_EVENT(EVT_GLTOOLBAR_SELECTBYPARTS, SimpleEvent);
class GLToolbarItem
{
@ -41,16 +48,12 @@ public:
Num_States
};
// typedef std::function<void()> Callback;
// typedef PerlCallback Callback;
struct Data
{
std::string name;
std::string tooltip;
unsigned int sprite_id;
bool is_toggable;
// Callback *action_callback;
wxEventType action_event;
Data();