Add Bind() support

Blake-Madden · Apr 8, 2024 · 41ddb80 · 41ddb80
1 parent 3fd395d
commit 41ddb80
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/base/canvas.cpp b/src/base/canvas.cpp
@@ -12,7 +12,8 @@
 #include "reportprintout.h"
 #include <wx/xrc/xmlres.h>
 
-wxDEFINE_EVENT(EVT_WISTERIA_CANVAS_DCLICK, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_WISTERIA_CANVAS_DCLICK, wxCommandEvent);
+
 wxIMPLEMENT_DYNAMIC_CLASS(Wisteria::Canvas, wxScrolledWindow);
 
 using namespace Wisteria::GraphItems;
@@ -1689,7 +1690,7 @@ namespace Wisteria
             }
         else if (event.LeftDClick())
             {
-            wxCommandEvent devent(EVT_WISTERIA_CANVAS_DCLICK, GetId());
+            wxCommandEvent devent(wxEVT_WISTERIA_CANVAS_DCLICK, GetId());
             devent.SetEventObject(this);
             GetEventHandler()->ProcessEvent(devent);
             }

diff --git a/src/base/canvas.h b/src/base/canvas.h
@@ -47,7 +47,11 @@
 #include "../ui/dialogs/radioboxdlg.h"
 
 /// @private
-wxDECLARE_EVENT(EVT_WISTERIA_CANVAS_DCLICK, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_WISTERIA_CANVAS_DCLICK, wxCommandEvent);
+
+/// @private
+#define EVT_WISTERIA_CANVAS_DCLICK(winid, fn)                                                               \
+    wx__DECLARE_EVT1(wxEVT_WISTERIA_CANVAS_DCLICK, winid, wxCommandEventHandler(fn))
 
 namespace Wisteria
     {