--- clientgui/BOINCGUIApp.cpp

+++ clientgui/BOINCGUIApp.cpp

@@ -584,22 +584,22 @@ void CBOINCGUIApp::SaveState() {

 ///

 void CBOINCGUIApp::OnInitCmdLine(wxCmdLineParser &parser) {

     wxApp::OnInitCmdLine(parser);

-    parser.AddSwitch("a", "autostart", _("BOINC Manager was started by the operating system automatically"));

+    parser.AddSwitch("a", "autostart", _("BOINC Manager was started by the operating system automatically").c_str());

 #if defined(__WXMSW__) || defined(__WXMAC__)

     parser.AddSwitch("s", "systray", _("Startup BOINC so only the system tray icon is visible"));

 #else

-    parser.AddOption("e", "clientdir", _("Directory containing the BOINC Client executable"));

-    parser.AddOption("d", "datadir", _("BOINC data directory"));

+    parser.AddOption("e", "clientdir", _("Directory containing the BOINC Client executable").c_str());

+    parser.AddOption("d", "datadir", _("BOINC data directory").c_str());

 #endif

-    parser.AddOption("n", "namehost", _("Host name or IP address"));

-    parser.AddOption("g", "gui_rpc_port", _("GUI RPC port number"));

-    parser.AddOption("p", "password", _("Password"));

-    parser.AddOption("b", "boincargs", _("Startup BOINC with these optional arguments"));

-    parser.AddSwitch("i","insecure", _("disable BOINC security users and permissions"));

-    parser.AddSwitch("c", "checkskins", _("set skin debugging mode to enable skin manager error messages"));

-    parser.AddSwitch("m", "multiple", _("multiple instances of BOINC Manager allowed"));

+    parser.AddOption("n", "namehost", _("Host name or IP address").c_str());

+    parser.AddOption("g", "gui_rpc_port", _("GUI RPC port number").c_str());

+    parser.AddOption("p", "password", _("Password").c_str());

+    parser.AddOption("b", "boincargs", _("Startup BOINC with these optional arguments").c_str());

+    parser.AddSwitch("i","insecure", _("disable BOINC security users and permissions").c_str());

+    parser.AddSwitch("c", "checkskins", _("set skin debugging mode to enable skin manager error messages").c_str());

+    parser.AddSwitch("m", "multiple", _("multiple instances of BOINC Manager allowed").c_str());

 #if (defined(__WXMAC__) && defined(_DEBUG))

     parser.AddLongOption("NSDocumentRevisionsDebugMode", _("Not used: workaround for bug in XCode 4.2"));

 #endif

-    parser.AddSwitch("nd", "no-daemon", _("Not run the daemon"));

+    parser.AddSwitch("nd", "no-daemon", _("Not run the daemon").c_str());

 }

--- clientgui/MainDocument.cpp-	2015-03-14 12:22:08.291199540 +0000

+++ clientgui/MainDocument.cpp	2015-03-14 12:33:51.571670397 +0000

@@ -580,14 +580,14 @@ int CMainDocument::OnPoll() {

         if (wxGetApp().GetNeedRunDaemon()) {

             if (IsComputerNameLocal(hostName)) {

                 if (m_pClientManager->StartupBOINCCore()) {

-                    Connect(wxT("localhost"), portNum, password, TRUE, TRUE);

+                    Connect((const wxChar*)"localhost", portNum, password.c_str(), TRUE, TRUE);

                 } else {

                     m_pNetworkConnection->ForceDisconnect();

                     pFrame->ShowDaemonStartFailedAlert();

                 }

             } else {

-                Connect(hostName, portNum, password, TRUE, password.IsEmpty());

+                Connect(hostName.c_str(), portNum, password.c_str(), TRUE, password.IsEmpty());

             }

         }

     }

--- clientgui/Makefile.am-	2015-03-14 12:54:24.030438939 +0000

+++ clientgui/Makefile.am	2015-03-14 12:55:17.909636694 +0000

@@ -103,7 +103,7 @@ EXTRA_DIST = *.h \

 boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CLFAGS)

 boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CFLAGS)

-boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK_LIBS)

+boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK_LIBS) -lwx_gtk3u_webview-3.1

 win_config.h: $(top_srcdir)/config.h

 	grep '#define.*BOINC.*VERSION' $^ > $@