Update the Microsoft Visual Studio build to match the MinGW32 build.

[bacula/bacula] / bacula / src / wx-console / main.cpp

diff --git a/bacula/src/wx-console/main.cpp b/bacula/src/wx-console/main.cpp
index 5dae9b5d8365695392529d4526aa3d9c52052b66..90522cdddc587c628a3d870ab5962d640f3ed35e 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-2005 Kern Sibbald
+   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
@@ -29,17 +29,20 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "config.h"
+#undef _DEBUG
+
+#include "bacula.h"
+
+#undef setlocale
+#undef textdomain
+#undef bindtextdomain
 
 #include <wx/wxprec.h>
 #include <wx/config.h>
 #include <wx/intl.h>
-
 #include "wxbmainframe.h"
-
 #include "csprint.h"
 
-void InitWinAPIWrapper();
 
 /* Dummy functions */
 int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
@@ -77,7 +80,7 @@ bool MyApp::OnInit()
 
    long posx, posy, sizex, sizey;
    int displayx, displayy;
-   InitWinAPIWrapper();
+   OSDependentInit();
    wxConfig::Get()->Read(wxT("/Position/X"), &posx, 50);
    wxConfig::Get()->Read(wxT("/Position/Y"), &posy, 50);
    wxConfig::Get()->Read(wxT("/Size/Width"), &sizex, 780);
@@ -109,7 +112,3 @@ bool MyApp::OnInit()
    
    return TRUE;
 }
-
-#ifndef HAVE_WIN32
-void InitWinAPIWrapper() { };
-#endif