X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwx-console%2Fwxbtreectrl.cpp;h=4271228499ac6aea049b1fdd1885a92c9633806a;hb=b8224aab234012c2d127b84eceb160e99dd4a14d;hp=9e4ee86a63cc47ebfc61fbf568d44257e80dd578;hpb=775d4d796be17ca77b9872308a162c48e2e7eff3;p=bacula%2Fbacula

diff --git a/bacula/src/wx-console/wxbtreectrl.cpp b/bacula/src/wx-console/wxbtreectrl.cpp
index 9e4ee86a63..4271228499 100644
--- a/bacula/src/wx-console/wxbtreectrl.cpp
+++ b/bacula/src/wx-console/wxbtreectrl.cpp
@@ -8,23 +8,42 @@
  *    Version $Id$
  */
 /*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
 
-   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.
+   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
 
-   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.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   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.
 
    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.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+
+/*  Windows debug builds set _DEBUG which is used by wxWidgets to select their
+ *  debug memory allocator.  Unfortunately it conflicts with Bacula's SmartAlloc.
+ * So we turn _DEBUG off since we aren't interested in things it enables.
  */
 
+#undef _DEBUG
+
+#include "bacula.h"
+
 #include "wxbtreectrl.h"
 
 #include "csprint.h"
@@ -35,7 +54,7 @@ BEGIN_EVENT_TABLE(wxbTreeCtrl, wxTreeCtrl)
    EVT_RIGHT_DOWN(wxbTreeCtrl::OnRightClicked)
 END_EVENT_TABLE()
 
-DEFINE_EVENT_TYPE(wxbTREE_MARKED_EVENT)
+DEFINE_LOCAL_EVENT_TYPE(wxbTREE_MARKED_EVENT)
 
 wxbTreeCtrl::wxbTreeCtrl(
       wxWindow* parent, wxEvtHandler* handler, wxWindowID id, const wxPoint& pos, const wxSize& size):