comparison Applications/Generic/GuiAdapter.h @ 1097:4383382db01d broker

deprecating LockingEmitter
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 24 Oct 2019 22:31:18 +0200
parents ac88989817e3
children 05d05cba0f4f
comparison
equal deleted inserted replaced
1096:97cbb2c31a65 1097:4383382db01d
93 struct GuiAdapterUiEvent; 93 struct GuiAdapterUiEvent;
94 struct GuiAdapterMouseEvent; 94 struct GuiAdapterMouseEvent;
95 struct GuiAdapterWheelEvent; 95 struct GuiAdapterWheelEvent;
96 struct GuiAdapterKeyboardEvent; 96 struct GuiAdapterKeyboardEvent;
97 97
98 class LockingEmitter; 98 namespace Deprecated
99 {
100 class LockingEmitter;
101 }
99 102
100 #if 1 103 #if 1
101 typedef bool (*OnMouseEventFunc)(std::string canvasId, const GuiAdapterMouseEvent* mouseEvent, void* userData); 104 typedef bool (*OnMouseEventFunc)(std::string canvasId, const GuiAdapterMouseEvent* mouseEvent, void* userData);
102 typedef bool (*OnMouseWheelFunc)(std::string canvasId, const GuiAdapterWheelEvent* wheelEvent, void* userData); 105 typedef bool (*OnMouseWheelFunc)(std::string canvasId, const GuiAdapterWheelEvent* wheelEvent, void* userData);
103 typedef bool (*OnKeyDownFunc) (std::string canvasId, const GuiAdapterKeyboardEvent* keyEvent, void* userData); 106 typedef bool (*OnKeyDownFunc) (std::string canvasId, const GuiAdapterKeyboardEvent* keyEvent, void* userData);
223 226
224 class GuiAdapter 227 class GuiAdapter
225 { 228 {
226 public: 229 public:
227 #if ORTHANC_ENABLE_THREADS == 1 230 #if ORTHANC_ENABLE_THREADS == 1
228 GuiAdapter(LockingEmitter& lockingEmitter) : lockingEmitter_(lockingEmitter) 231 GuiAdapter(Deprecated::LockingEmitter& lockingEmitter) : lockingEmitter_(lockingEmitter)
229 #else 232 #else
230 GuiAdapter() 233 GuiAdapter()
231 #endif 234 #endif
232 { 235 {
233 static int instanceCount = 0; 236 static int instanceCount = 0;
299 #if ORTHANC_ENABLE_THREADS == 1 302 #if ORTHANC_ENABLE_THREADS == 1
300 /** 303 /**
301 This object is used by the multithreaded Oracle to serialize access to 304 This object is used by the multithreaded Oracle to serialize access to
302 shared data. We need to use it as soon as we access the state. 305 shared data. We need to use it as soon as we access the state.
303 */ 306 */
304 LockingEmitter& lockingEmitter_; 307 Deprecated::LockingEmitter& lockingEmitter_;
305 #endif 308 #endif
306 309
307 /** 310 /**
308 In SDL, this executes all the registered headers 311 In SDL, this executes all the registered headers
309 */ 312 */