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

Merge branch 'rr1-maint'

Browse source
This commit is contained in:
Ilari Liusvaara 2012-04-08 17:02:53 +03:00
commit 0ad7fad306
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/platform/wxwidgets/settings.cpp
View file

@ -988,7 +988,7 @@ wxeditor_esettings_hotkeys::wxeditor_esettings_hotkeys(wxWindow* parent)
SetSizer(top_s); SetSizer(top_s);
top_s->Add(select = new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS | top_s->Add(select = new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS |
wxTR_HIDE_ROOT), 1, wxGROW); wxTR_HIDE_ROOT | wxTR_LINES_AT_ROOT), 1, wxGROW);
wxBoxSizer* pbutton_s = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* pbutton_s = new wxBoxSizer(wxHORIZONTAL);
pbutton_s->AddStretchSpacer(); pbutton_s->AddStretchSpacer();
@ -1000,7 +1000,7 @@ wxeditor_esettings_hotkeys::wxeditor_esettings_hotkeys(wxWindow* parent)
wxCommandEventHandler(wxeditor_esettings_hotkeys::on_secondary), NULL, this); wxCommandEventHandler(wxeditor_esettings_hotkeys::on_secondary), NULL, this);
top_s->Add(pbutton_s, 0, wxGROW); top_s->Add(pbutton_s, 0, wxGROW);
items[""] = select->AddRoot(wxT("")); items[""] = select->AddRoot(wxT("<root>"));
refresh(); refresh();
top_s->SetSizeHints(this); top_s->SetSizeHints(this);