kes wx-console crashes because of differences between Bacula and wxWidgets

[bacula/bacula] / bacula / src / wx-console / wxblistctrl.cpp

diff --git a/bacula/src/wx-console/wxblistctrl.cpp b/bacula/src/wx-console/wxblistctrl.cpp
index 0300acc07e45c9121b3b5867ddc2eeecd5257fa2..ddfd79b6ba2421fdb6e44951e794932569deaee0 100644 (file)
--- a/bacula/src/wx-console/wxblistctrl.cpp
+++ b/bacula/src/wx-console/wxblistctrl.cpp
@@ -5,27 +5,26 @@
  *
  *    Nicolas Boichat, April 2004
  *
+ *    Version $Id$
  */
 /*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   Copyright (C) 2004-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include "wxblistctrl.h"
+#include "bacula.h"
 
+#include "wxblistctrl.h"
 #include "csprint.h"
 #include "wxbmainframe.h"
 
@@ -37,8 +36,9 @@ END_EVENT_TABLE()
 DEFINE_LOCAL_EVENT_TYPE(wxbLIST_MARKED_EVENT)
 
 wxbListCtrl::wxbListCtrl(
-      wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size): 
-            wxListCtrl(parent, id, pos, size,wxLC_REPORT) {
+      wxWindow* parent, wxEvtHandler* handler, wxWindowID id, const wxPoint& pos, const wxSize& size): 
+            wxListCtrl(parent, id, pos, size, wxLC_REPORT | wxSUNKEN_BORDER) {
+   this->handler = handler;
 }
 
 wxbListCtrl::~wxbListCtrl() {}
@@ -50,7 +50,7 @@ void wxbListCtrl::OnDoubleClicked(wxMouseEvent& event) {
    if (event.GetX() < GetColumnWidth(0)) {
       wxbListMarkedEvent evt(GetId());
 
-      GetParent()->GetEventHandler()->ProcessEvent(evt);
+      handler->ProcessEvent(evt);
       
       //No Skip : we don't want to go in this directory (if it is a directory)
    }
@@ -65,7 +65,7 @@ void wxbListCtrl::OnDoubleClicked(wxMouseEvent& event) {
 void wxbListCtrl::OnRightClicked(wxMouseEvent& event) {
    wxbListMarkedEvent evt(GetId());
 
-   GetParent()->GetEventHandler()->ProcessEvent(evt);
+   handler->ProcessEvent(evt);
 }
 
 /* Customized tree event, used for marking events */