From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 10 May 2005 13:25:51 +0000 (+0000)
Subject: Correct a minor build problem with wx-console.
X-Git-Tag: Release-1.38.0~477
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5553ba4b78337433178cc70077b404d14567b35d;p=bacula%2Fbacula

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 0eed96f451..0c26b3e48b 100644
--- 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 2dce15d778..0b38fb7892 100644
--- 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 4d1ce9bd5e..0fbe93921a 100644
--- 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++) {