X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwx-console%2Fwxbutils.cpp;h=ce9f9baea0abad8910bbe8a750bce6798e77ae33;hb=3227fb78cccb8cf93511f0ee55a21aff8f372ab9;hp=11139b5ae8e736bf12d617641ed8238ce7d31e75;hpb=5afded630aad7c0b40d795de41bc11be314df77d;p=bacula%2Fbacula

diff --git a/bacula/src/wx-console/wxbutils.cpp b/bacula/src/wx-console/wxbutils.cpp
index 11139b5ae8..ce9f9baea0 100644
--- a/bacula/src/wx-console/wxbutils.cpp
+++ b/bacula/src/wx-console/wxbutils.cpp
@@ -1,3 +1,30 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2004-2008 Free Software Foundation Europe e.V.
+
+   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 and included
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of Kern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 /*
  *
  *   wxbDataParser, class that receives and analyses data
@@ -6,30 +33,18 @@
  *
  *    Version $Id$
  */
-/*
-   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.
+/*  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.
+ */
 
-   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.
+#undef _DEBUG
 
-   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 "bacula.h"
 #include "wxbutils.h"
-
 #include "wxbmainframe.h"
-
 #include "csprint.h"
-
 #include "wxbtableparser.h"
 
 /* A macro named Yield is defined under MinGW */
@@ -39,7 +54,7 @@ bool wxbUtils::inited = false;
 
 wxString wxbUtils::ConvertToPrintable(wxString& str) {
    /* FIXME : Unicode support should be added to fix this problem */
-#if needed // wxUSE_UNICODE == 0
+#if (wxUSE_UNICODE == 0) && __WXGTK20__
    wxString strnew(str);
    /* Convert the string to something printable without unicode */
    for (unsigned int i = 0; i < strnew.Length(); i++) {
@@ -316,7 +331,6 @@ bool wxbPromptParser::Analyse(wxString str, int status) {
             choices->Add(wxT("no"));
             numerical = false;
          }
-         
          return true;
       }
       else { /* ended or (dis)connected */