From 82440c44bb6ca0f612733a43b9284e670e266be3 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Fri, 13 Sep 2013 11:53:45 +0300 Subject: [PATCH] Fix compilation if wxString is wchar_t-based --- src/platform/wxwidgets/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platform/wxwidgets/mainwindow.cpp b/src/platform/wxwidgets/mainwindow.cpp index 8f0350a8..0e9de282 100644 --- a/src/platform/wxwidgets/mainwindow.cpp +++ b/src/platform/wxwidgets/mainwindow.cpp @@ -1012,13 +1012,13 @@ void wxwin_mainwindow::request_rom(std::string& filename, core_type& coretype) filter = filter + "*." + i; } filter = filter + "|All files|*.*"; - wxFileDialog* fdiag = new wxFileDialog(this, wxT("Load ROM"), towxstring(rom_path()), "", towxstring(filter), - wxFD_OPEN); + wxFileDialog* fdiag = new wxFileDialog(this, wxT("Load ROM"), towxstring(rom_path()), wxT(""), + towxstring(filter), wxFD_OPEN); if(fdiag->ShowModal() != wxID_OK) { delete fdiag; return; } - filename = fdiag->GetPath(); + filename = tostdstring(fdiag->GetPath()); delete fdiag; }