empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Win32 compile errors

Browse source
This commit is contained in:
Ilari Liusvaara 2013-01-16 17:20:33 +02:00
parent 006eaf3c78
commit 154bcc7459
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/platform/wxwidgets/editor-conflict.cpp
View file

@ -29,7 +29,7 @@ private:
}; };
wxeditor_conflict::wxeditor_conflict(wxWindow* parent) wxeditor_conflict::wxeditor_conflict(wxWindow* parent)
: wxDialog(parent, wxID_ANY, wxT("lsnes: Edit conflicts")) : wxDialog(parent, wxID_ANY, wxT("lsnes: Edit conflicts"), wxDefaultPosition, wxSize(-1, -1))
{ {
Centre(); Centre();
wxFlexGridSizer* top_s = new wxFlexGridSizer(2, 1, 0, 0); wxFlexGridSizer* top_s = new wxFlexGridSizer(2, 1, 0, 0);
@ -106,7 +106,7 @@ void wxeditor_conflict::add_option(wxWindow* win, wxSizer* sizer, const std::str
if(core_selections.count(key) && !dfltidx) { if(core_selections.count(key) && !dfltidx) {
bad_defaults.insert(key); bad_defaults.insert(key);
dfltidx = v.size(); dfltidx = v.size();
v.push_back("bad default [" + core_selections[key] + "]"); v.push_back(towxstring("bad default [" + core_selections[key] + "]"));
} }
sizer->Add(choices[key] = new wxComboBox(win, wxID_ANY, v[dfltidx], wxDefaultPosition, wxDefaultSize, sizer->Add(choices[key] = new wxComboBox(win, wxID_ANY, v[dfltidx], wxDefaultPosition, wxDefaultSize,