Fix some trivial errors and implemented the restore of IRIX xattrs.

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

diff --git a/bacula/src/wx-console/wxbhistorytextctrl.cpp b/bacula/src/wx-console/wxbhistorytextctrl.cpp
index 6037ad582784efbccbbe1b4ffad3cc6e5004f8b5..619a220876a03a617a2c4703c9d5bfa602cbed60 100644 (file)
--- a/bacula/src/wx-console/wxbhistorytextctrl.cpp
+++ b/bacula/src/wx-console/wxbhistorytextctrl.cpp
@@ -7,20 +7,41 @@
  *    Version $Id$
  */
 /*
-   Copyright (C) 2004-2005 Kern Sibbald
+   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
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
+   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 
-   the file LICENSE for additional 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 three of the GNU Affero 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 Affero 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.
+*/
+
+/*  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 "wxbhistorytextctrl.h"
 
 BEGIN_EVENT_TABLE(wxbHistoryTextCtrl, wxTextCtrl)
@@ -58,7 +79,7 @@ void wxbHistoryTextCtrl::HistoryAdd(wxString cmd) {
 
 void wxbHistoryTextCtrl::SetValue(const wxString& value) {
    if (value == wxT("")) {
-      help->SetLabel(wxT(_("Type your command below:")));
+      help->SetLabel(_("Type your command below:"));
    }
    wxTextCtrl::SetValue(value);
 }
@@ -93,7 +114,7 @@ void wxbHistoryTextCtrl::OnKeyUp(wxKeyEvent& event) {
    else if (GetValue() != wxT("")) {
       wxbCommands::iterator it;
       wxString key;
-      wxString helptext = wxT(_("Unknown command."));
+      wxString helptext = _("Unknown command.");
       int found = 0;      
       for( it = commands.begin(); it != commands.end(); ++it ) {         
          if (it->first.Find(GetValue()) == 0) {
@@ -102,7 +123,7 @@ void wxbHistoryTextCtrl::OnKeyUp(wxKeyEvent& event) {
                helptext += wxT(" ") + it->first;
             }
             else if (found > 1) {
-               helptext = wxT(_("Possible completions: ")) + key + wxT(" ") + it->first;
+               helptext = _("Possible completions: ") + key + wxT(" ") + it->first;
             }
             else { // (found == 1)
                helptext = it->first + wxT(": ") + it->second;
@@ -129,7 +150,7 @@ void wxbHistoryTextCtrl::OnKeyUp(wxKeyEvent& event) {
       }
    }
    else {
-      help->SetLabel(wxT(_("Type your command below:")));
+      help->SetLabel(_("Type your command below:"));
       event.Skip();
    }
 }