X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwx-console%2Fwxbtreectrl.cpp;h=8caaec3694fceb0441c3c45976a4e25a9d30e46f;hb=d63a5649eea93bcdf6cb9b50166c9b78ba8aa63e;hp=4647d07a91f0bde1cd7d69fcfecb22c1285036c8;hpb=83a50ae6f43cd7fed0215dd0d525e8f5d814b3c1;p=bacula%2Fbacula diff --git a/bacula/src/wx-console/wxbtreectrl.cpp b/bacula/src/wx-console/wxbtreectrl.cpp index 4647d07a91..8caaec3694 100644 --- a/bacula/src/wx-console/wxbtreectrl.cpp +++ b/bacula/src/wx-console/wxbtreectrl.cpp @@ -34,11 +34,12 @@ BEGIN_EVENT_TABLE(wxbTreeCtrl, wxTreeCtrl) EVT_RIGHT_DOWN(wxbTreeCtrl::OnRightClicked) END_EVENT_TABLE() -DEFINE_LOCAL_EVENT_TYPE(wxbTREE_MARKED_EVENT) +DEFINE_EVENT_TYPE(wxbTREE_MARKED_EVENT) wxbTreeCtrl::wxbTreeCtrl( - wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size): + wxWindow* parent, wxEvtHandler* handler, wxWindowID id, const wxPoint& pos, const wxSize& size): wxTreeCtrl(parent, id, pos, size, wxSUNKEN_BORDER | wxTR_HAS_BUTTONS) { + this->handler = handler; } wxbTreeCtrl::~wxbTreeCtrl() {} @@ -52,7 +53,7 @@ void wxbTreeCtrl::OnDoubleClicked(wxMouseEvent& event) { if ((flags & wxTREE_HITTEST_ONITEMICON) && (treeid.IsOk())) { wxbTreeMarkedEvent evt(GetId(), treeid); - GetParent()->GetEventHandler()->ProcessEvent(evt); + handler->ProcessEvent(evt); //No Skip : we don't want this item to be collapsed or expanded } @@ -70,7 +71,7 @@ void wxbTreeCtrl::OnRightClicked(wxMouseEvent& event) { if (treeid.IsOk()) { wxbTreeMarkedEvent evt(GetId(), treeid); - GetParent()->GetEventHandler()->ProcessEvent(evt); + handler->ProcessEvent(evt); } event.Skip(); }