Change Groupbox name to Remote Director in Configuration page if Director is not...

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

diff --git a/bacula/src/wx-console/wxbutils.cpp b/bacula/src/wx-console/wxbutils.cpp
index 59c1cb5b00e7d471ddcf5469f19f40297c24a041..1b7e9fb8eca1e209669150869a1c63f435395a33 100644 (file)
--- a/bacula/src/wx-console/wxbutils.cpp
+++ b/bacula/src/wx-console/wxbutils.cpp
@@ -7,11 +7,11 @@
  *    Version $Id$
  */
 /*
-   Copyright (C) 2004-2005 Kern Sibbald
+   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
-   version 2 as ammended with additional clauses defined in the
+   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,
@@ -20,7 +20,16 @@
    the file LICENSE for additional details.
 
  */
- 
+
+/*  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 "wxbutils.h"
 
 #include "wxbmainframe.h"