Correct a minor build problem with wx-console.

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

diff --git a/bacula/src/wx-console/console_thread.cpp b/bacula/src/wx-console/console_thread.cpp
index 0eed96f451046da1ab2093e8775f6e94d3f91ee4..0c26b3e48b6bd054cc6a4db73f906159a569efca 100644 (file)
--- a/bacula/src/wx-console/console_thread.cpp
+++ b/bacula/src/wx-console/console_thread.cpp
@@ -41,7 +41,6 @@
 
 #ifdef HAVE_WIN32
 #include <windows.h>
-DWORD  g_platform_id = VER_PLATFORM_WIN32_WINDOWS;
 char OK_msg[]   = "2000 OK\n";
 char TERM_msg[] = "2999 Terminate\n";
 #endif

diff --git a/bacula/src/wx-console/main.cpp b/bacula/src/wx-console/main.cpp
index 2dce15d7789a56ecf6ad7462b2c0acbff1303ecb..0b38fb78923c2be2b7b318261f27e0ccdc3910f4 100644 (file)
--- a/bacula/src/wx-console/main.cpp
+++ b/bacula/src/wx-console/main.cpp
@@ -7,7 +7,7 @@
  *    Version $Id$
  */
 /*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   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
@@ -39,6 +39,8 @@
 
 #include "csprint.h"
 
+void InitWinAPIWrapper();
+
 /* Dummy functions */
 int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
 int generate_job_event(JCR *jcr, const char *event) { return 1; }
@@ -69,6 +71,7 @@ bool MyApp::OnInit()
 {
    long posx, posy, sizex, sizey;
    int displayx, displayy;
+   InitWinAPIWrapper();
    wxConfig::Get()->Read("/Position/X", &posx, 50);
    wxConfig::Get()->Read("/Position/Y", &posy, 50);
    wxConfig::Get()->Read("/Size/Width", &sizex, 780);

diff --git a/bacula/src/wx-console/wxbutils.cpp b/bacula/src/wx-console/wxbutils.cpp
index 4d1ce9bd5e89ef6358cbd8ac2b98ec2e074d289e..0fbe93921a99ca7d59cb7114bd60ad55d0592d5d 100644 (file)
--- a/bacula/src/wx-console/wxbutils.cpp
+++ b/bacula/src/wx-console/wxbutils.cpp
@@ -39,7 +39,7 @@ bool wxbUtils::inited = false;
 
 wxString wxbUtils::ConvertToPrintable(wxString& str) {
    /* FIXME : Unicode support should be added to fix this problem */
-#if wxUSE_UNICODE == 0
+#if needed // wxUSE_UNICODE == 0
    wxString strnew(str);
    /* Convert the string to something printable without unicode */
    for (unsigned int i = 0; i < strnew.Length(); i++) {