This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / src / wx-console / console_thread.h

diff --git a/bacula/src/wx-console/console_thread.h b/bacula/src/wx-console/console_thread.h
index ff126d3d7616612472c92da41eca617661bb3f3f..2c2411e18934ce54b1fe5ac69e8ef1c8d24f9976 100644 (file)
--- a/bacula/src/wx-console/console_thread.h
+++ b/bacula/src/wx-console/console_thread.h
@@ -7,21 +7,18 @@
  *    Version $Id$
  */
 /*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   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
-   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.
  */
 
 #ifndef CONSOLE_THREAD_H
@@ -29,7 +26,9 @@
 
 #include <wx/wxprec.h>
 
+#include <wx/string.h>
 #include <wx/thread.h> // inheriting class's header file
+#include <wx/intl.h> /* We need to have _ and N_ defined by wxWidgets before Bacula tries to redefine them */
 #include "bacula.h"
 #include "jcr.h"
 
@@ -47,7 +46,7 @@ class console_thread : public wxThread
       void* Entry();
       void Write(const char* str);
       virtual void Delete();
-      
+
       static void InitLib();
       static void FreeLib();
       static wxString LoadConfig(wxString configfile);
@@ -55,13 +54,13 @@ class console_thread : public wxThread
    private:
       static bool inited;
       static bool configloaded;
-      
+
       bool choosingdirector;
-      
+
       static wxString working_dir;
-      
+
       int directorchoosen;
-      
+
       BSOCK* UA_sock;
       JCR jcr;
 };