amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 13:17:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash in TextCtrl;

Browse Source 
No longer ask to save set when it is still open in another window.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@862 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-05-18 18:59:55 +00:00
parent 4c48049453
commit d94b2f688b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/text_ctrl.cpp
+3
View File
@@ -74,6 +74,7 @@ void TextCtrl::setValue(const FakeTextValueP& value) {
} }
void TextCtrl::onChangeSet() { void TextCtrl::onChangeSet() {
wxLogDebug(_("TextCtrl::onChangeSet %p"),this);
DataEditor::onChangeSet(); DataEditor::onChangeSet();
// initialize // initialize
if (viewers.empty()) { if (viewers.empty()) {
@@ -109,6 +110,8 @@ void TextCtrl::onInit() {
FOR_EACH_EDITOR { FOR_EACH_EDITOR {
e->onShow(true); e->onShow(true);
} }
// also init the DataEditor
DataEditor::onInit();
} }
void TextCtrl::onSize(wxSizeEvent&) { void TextCtrl::onSize(wxSizeEvent&) {
src/gui/set/window.cpp
+2 -2
View File
@@ -437,14 +437,14 @@ void SetWindow::updateRecentSets() {
void SetWindow::onFileNew(wxCommandEvent&) { void SetWindow::onFileNew(wxCommandEvent&) {
if (!askSaveAndContinue()) return; if (isOnlyWithSet() && !askSaveAndContinue()) return;
// new set? // new set?
SetP new_set = new_set_window(this); SetP new_set = new_set_window(this);
if (new_set) setSet(new_set); if (new_set) setSet(new_set);
} }
void SetWindow::onFileOpen(wxCommandEvent&) { void SetWindow::onFileOpen(wxCommandEvent&) {
if (!askSaveAndContinue()) return; if (isOnlyWithSet() && !askSaveAndContinue()) return;
wxFileDialog dlg(this, _TITLE_("open set"), _(""), _(""), import_formats(), wxOPEN); wxFileDialog dlg(this, _TITLE_("open set"), _(""), _(""), import_formats(), wxOPEN);
if (dlg.ShowModal() == wxID_OK) { if (dlg.ShowModal() == wxID_OK) {
wxBusyCursor busy; wxBusyCursor busy;