From d16064c0cc3a86eaf3f352880f88f40cf6934ee0 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 22 Mar 2010 23:58:17 +0000 Subject: [PATCH] MGR: Fix crash bug when using Mac accessibility with Event Log svn path=/trunk/boinc/; revision=20983 --- checkin_notes | 6 ++++++ clientgui/DlgEventLogListCtrl.cpp | 6 +++--- clientgui/DlgEventLogListCtrl.h | 6 +++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index 5de4b2ed74..7f09891702 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2032,3 +2032,9 @@ David 22 Mar 2010 sched/ sched_shmem.cpp,h feeder.cpp + +Charlie 22 Mar 2010 + - MGR: Fix crash bug when using Mac accessibility with Event Log. + + clientgui/ + DlgEventLogListCtrl.cpp, .h diff --git a/clientgui/DlgEventLogListCtrl.cpp b/clientgui/DlgEventLogListCtrl.cpp index 0db26ac244..75a7d0d810 100644 --- a/clientgui/DlgEventLogListCtrl.cpp +++ b/clientgui/DlgEventLogListCtrl.cpp @@ -33,9 +33,9 @@ #include "DlgEventLog.h" -IMPLEMENT_DYNAMIC_CLASS(CDlgEventLogListCtrl, wxListView) +IMPLEMENT_DYNAMIC_CLASS(CDlgEventLogListCtrl, DLG_LISTCTRL_BASE) -BEGIN_EVENT_TABLE(CDlgEventLogListCtrl, wxListView) +BEGIN_EVENT_TABLE(CDlgEventLogListCtrl, DLG_LISTCTRL_BASE) EVT_LEFT_UP(CDlgEventLogListCtrl::OnMouseUp) END_EVENT_TABLE() @@ -43,7 +43,7 @@ END_EVENT_TABLE() CDlgEventLogListCtrl::CDlgEventLogListCtrl() {} CDlgEventLogListCtrl::CDlgEventLogListCtrl(CDlgEventLog* pView, wxWindowID iListWindowID, wxInt32 iListWindowFlags) - : wxListView(pView, iListWindowID, wxDefaultPosition, wxSize(640,480), iListWindowFlags) + : DLG_LISTCTRL_BASE(pView, iListWindowID, wxDefaultPosition, wxSize(640,480), iListWindowFlags) { m_pParentView = pView; diff --git a/clientgui/DlgEventLogListCtrl.h b/clientgui/DlgEventLogListCtrl.h index 562b53a256..aaa2e4c968 100644 --- a/clientgui/DlgEventLogListCtrl.h +++ b/clientgui/DlgEventLogListCtrl.h @@ -24,11 +24,15 @@ #ifdef __WXMAC__ #include "macAccessiblity.h" +#define DLG_LISTCTRL_BASE wxGenericListCtrl +#else +#define DLG_LISTCTRL_BASE wxListView + #endif class CDlgEventLog; -class CDlgEventLogListCtrl : public wxListView +class CDlgEventLogListCtrl : public DLG_LISTCTRL_BASE { DECLARE_DYNAMIC_CLASS(CDlgEventLogListCtrl) DECLARE_EVENT_TABLE()