Apply patch from Felix Schwarz <Felix.Schwarz@web.de> that allows

     building wxconsole on Fedora 7 with wxWidgets 2.8 (it works with
     2.6 as well).

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5240 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index aaea3295d879479227114876a41a4e8485c94c13..1d5fca0097382c6089c63ed2f6f43cfd9ba32f92 100644 (file)
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -493,4 +493,4 @@ const char *uar_jobid_fileindex_from_dir =
  
 /* Query to get list of files from table -- presuably built by an external program */
 const char *uar_jobid_fileindex_from_table = 
-   "SELECT JobId, FileIndex from %s";
+   "SELECT JobId,FileIndex from %s";

diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp
index dae497a7e017be3907e16322ba1cc48478e4b049..f74163bc00de3158026e88aeb1cf8630e7b509af 100644 (file)
--- a/bacula/src/wx-console/wxbrestorepanel.cpp
+++ b/bacula/src/wx-console/wxbrestorepanel.cpp
@@ -80,6 +80,7 @@ Select parameter to modify (1-11):
 #include "unmarked.xpm"
 #include "marked.xpm"
 #include "partmarked.xpm"
+#include <wx/imaglist.h>
 #include <wx/listimpl.cpp>
 
 /* A macro named Yield is defined under MinGW */

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index d59230be6eb13e0e20cb6e2d6a28905d205ffb71..7fbdc0802fab1c891de28a093977aebb3991a471 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,10 @@
               Technical notes on version 2.1
 
 General:
+25Jul07
+kes  Apply patch from Felix Schwarz <Felix.Schwarz@web.de> that allows
+     building wxconsole on Fedora 7 with wxWidgets 2.8 (it works with
+     2.6 as well).
 24Jul07 
 kes  Implement PopUp YES/NO dialog for bat.
 23Jul07