From 73060dc864064e65df14a26e866db3c7a060882c Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Tue, 10 Apr 2012 15:42:36 +0300 Subject: [PATCH 1/3] Wxwidgets: Fix ROM select dialog with wxwidgets 2.9 --- src/platform/wxwidgets/romselect.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platform/wxwidgets/romselect.cpp b/src/platform/wxwidgets/romselect.cpp index 197e3d1e..2c88f671 100644 --- a/src/platform/wxwidgets/romselect.cpp +++ b/src/platform/wxwidgets/romselect.cpp @@ -300,6 +300,7 @@ namespace cb = _cb; panel = new wxPanel(in_window); top = new wxBoxSizer(wxVERTICAL); + panel->SetSizer(top); box = new wxStaticBox(panel, wxID_ANY, wxT("")); intsizer = new wxStaticBoxSizer(box, wxVERTICAL); intsizer->Add(new wxStaticText(panel, wxID_ANY, wxT("File"))); From 940ac54356d1c6a14df0fe70d5e347dfe134efa2 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Tue, 10 Apr 2012 18:14:11 +0300 Subject: [PATCH 2/3] Wxwidgets: Project options dialog improvements: - If last saved file is known for ROM, select load file, otherwise new project. - Fix bug where load button was disabled if file was autofilled. --- src/platform/wxwidgets/romselect.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/platform/wxwidgets/romselect.cpp b/src/platform/wxwidgets/romselect.cpp index 2c88f671..74ed16ea 100644 --- a/src/platform/wxwidgets/romselect.cpp +++ b/src/platform/wxwidgets/romselect.cpp @@ -942,14 +942,21 @@ wxwin_project::wxwin_project(loaded_rom& rom) wxCommandEventHandler(wxwin_project::on_quit), NULL, this); toplevel->Add(buttonbar, 0, wxGROW); + bool file_filled = false; { std::ifstream s(get_config_path() + "/" + our_rom_name + ".ls"); std::getline(s, last_save); savefile->SetValue(towxstring(last_save)); + if(last_save != "") + file_filled = true; } - wxNotebookEvent e2; - on_tab_select(e2); + //This gets re-enabled later if needed. + load_file = true; + load->Disable(); + notebook->SetSelection(file_filled ? 0 : 1); + wxCommandEvent e2; + on_filename_change(e2); mainblock->SetSizeHints(this); new_sizer->SetSizeHints(this); From 84308b0ed25a75a16a3a79099afb791b24467a04 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Tue, 10 Apr 2012 19:24:03 +0300 Subject: [PATCH 3/3] Make settings dialog saner size if there are no joysticks --- src/platform/wxwidgets/settings.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platform/wxwidgets/settings.cpp b/src/platform/wxwidgets/settings.cpp index f793e626..30cfe30f 100644 --- a/src/platform/wxwidgets/settings.cpp +++ b/src/platform/wxwidgets/settings.cpp @@ -1533,6 +1533,7 @@ wxeditor_esettings::wxeditor_esettings(wxWindow* parent) tabset->AddPage(new wxeditor_esettings_aliases(tabset), wxT("Aliases")); tabset->AddPage(new wxeditor_esettings_bindings(tabset), wxT("Bindings")); tabset->AddPage(new wxeditor_esettings_advanced(tabset), wxT("Advanced")); + tabset->SetMinSize(wxSize(400, 420)); top_s->Add(tabset, 1, wxGROW); wxBoxSizer* pbutton_s = new wxBoxSizer(wxHORIZONTAL);