Remove delete of CVS files

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

diff --git a/bacula/src/wx-console/wxbtreectrl.cpp b/bacula/src/wx-console/wxbtreectrl.cpp
index b22242e406cdb8693b349afa6382544e773ede73..ddfc1f1518fcee3bf7b2ac2af29101a9203990f5 100644 (file)
--- a/bacula/src/wx-console/wxbtreectrl.cpp
+++ b/bacula/src/wx-console/wxbtreectrl.cpp
@@ -5,23 +5,21 @@
  *
  *    Nicolas Boichat, April 2004
  *
+ *    Version $Id$
  */
 /*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   Copyright (C) 2004-2005 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 "wxbtreectrl.h"
@@ -34,12 +32,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): 
-            wxTreeCtrl(parent, id, pos, size) {
-   marked = false;
+      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() {}
@@ -53,7 +51,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
    }
@@ -71,7 +69,7 @@ void wxbTreeCtrl::OnRightClicked(wxMouseEvent& event) {
    if (treeid.IsOk()) {
       wxbTreeMarkedEvent evt(GetId(), treeid);
 
-      bool res = GetParent()->GetEventHandler()->ProcessEvent(evt);
+      handler->ProcessEvent(evt);
    }
    event.Skip();
 }