From: Nicolas Boichat <nicolas@boichat.ch>
Date: Sun, 24 Apr 2005 22:12:49 +0000 (+0000)
Subject: Fixes to make wx-console compatible with wxWidgets 2.6.0.
X-Git-Tag: Release-1.38.0~543
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8930c5ebc6f93e1e9bf91035ab57bcbccc7f5abb;p=bacula%2Fbacula

Fixes to make wx-console compatible with wxWidgets 2.6.0.


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

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index d6e675bc90..5cda012fd1 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -442,8 +442,10 @@ int  m_msg(const char *file, int line, POOLMEM *&pool_buf, const char *fmt, ...)
 
 
 /* Use our strdup with smartalloc */
+#ifndef __WXGTK__
 #undef strdup
 #define strdup(buf) bad_call_on_strdup_use_bstrdup(buf)
+#endif
 
 /* Use our fgets which handles interrupts */
 #undef fgets
diff --git a/bacula/src/wx-console/CHANGELOG b/bacula/src/wx-console/CHANGELOG
index 9ffc7b3f30..902dbbb2e5 100644
--- a/bacula/src/wx-console/CHANGELOG
+++ b/bacula/src/wx-console/CHANGELOG
@@ -1,3 +1,6 @@
+25-04-2005 :
+ - Fixes to make wx-console compatible with wxWidgets 2.6.0.
+
 24-03-2005 :
  - wxbMainFrame : Fix a bug with GTK+-1.2 which caused wx-console to crash
    when starting.
diff --git a/bacula/src/wx-console/console_thread.h b/bacula/src/wx-console/console_thread.h
index eaee9ec92e..bf363f3c53 100644
--- a/bacula/src/wx-console/console_thread.h
+++ b/bacula/src/wx-console/console_thread.h
@@ -29,6 +29,7 @@
 
 #include <wx/wxprec.h>
 
+#include <wx/string.h>
 #include <wx/thread.h> // inheriting class's header file
 #include "bacula.h"
 #include "jcr.h"
diff --git a/bacula/src/wx-console/main.cpp b/bacula/src/wx-console/main.cpp
index a1ebab7800..07a8dcb3f6 100644
--- a/bacula/src/wx-console/main.cpp
+++ b/bacula/src/wx-console/main.cpp
@@ -32,17 +32,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-   #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
-#ifndef WX_PRECOMP
-   #include "wx/wx.h"
-#endif
+#include <wx/wxprec.h>
 
 #include "wxbmainframe.h"