mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 13:17:00 -04:00
Dependency following now works
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@95 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -145,7 +145,7 @@ DisplayPreferencesPage::DisplayPreferencesPage(Window* parent)
|
||||
s5->Add(new wxStaticText(this, wxID_ANY, _("Columns: ")), 0, wxALL & ~wxLEFT | wxEXPAND, 4);
|
||||
s5->Add(columns);
|
||||
s4->Add(s5, 0, wxEXPAND | wxALL, 4);
|
||||
s->Add(s, 0, wxEXPAND | wxALL & ~wxTOP, 8);
|
||||
s->Add(s4, 0, wxEXPAND | wxALL & ~wxTOP, 8);
|
||||
s->SetSizeHints(this);
|
||||
SetSizer(s);
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <gui/about_window.hpp>
|
||||
#include <gui/update_checker.hpp>
|
||||
#include <gui/new_window.hpp>
|
||||
#include <gui/preferences_window.hpp>
|
||||
#include <gui/icon_menu.hpp>
|
||||
#include <util/window_id.hpp>
|
||||
#include <data/game.hpp>
|
||||
@@ -487,7 +488,8 @@ void SetWindow::onReplaceAll(wxFindDialogEvent&) {
|
||||
}
|
||||
|
||||
void SetWindow::onEditPreferences(wxCommandEvent&) {
|
||||
// SettingsWindow wnd(this);
|
||||
PreferencesWindow wnd(this);
|
||||
wnd.ShowModal();
|
||||
// if (wnd.ShowModal() == wxID_OK) {
|
||||
// // render settings may have changed, notify all windows
|
||||
// FOR_EACH(m, setWindows) {
|
||||
|
||||
Reference in New Issue
Block a user