timw4mail/Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a file closing edge case

Browse Source
This commit is contained in:
Timothy Warren 2015-04-21 10:21:02 -04:00
parent d0db1a0d7f
commit 586824e111
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/widgets/MainFrame.cpp
View File

@ -3,7 +3,7 @@
*/ */
#include "MainFrame.h" #include "MainFrame.h"
MainFrame::MainFrame(wxFrame *frame, const wxString& title) MainFrame::MainFrame(wxFrame *frame, const wxString &title)
: wxFrame(frame, -1, title) : wxFrame(frame, -1, title)
{ {
#include "../../resources/xpm/document.xpm" #include "../../resources/xpm/document.xpm"
@ -79,7 +79,7 @@ void MainFrame::SetupToolbar()
toolBar->AddTool(wxID_NEW, "New", new_file_icon, "New file"); toolBar->AddTool(wxID_NEW, "New", new_file_icon, "New file");
toolBar->AddTool(wxID_OPEN, "Open", open_file_icon, "Open file"); toolBar->AddTool(wxID_OPEN, "Open", open_file_icon, "Open file");
toolBar->AddTool(wxID_SAVE, "Save", save_file_icon, "Save file"); toolBar->AddTool(wxID_SAVE, "Save", save_file_icon, "Save file");
#ifndef WIN32 #ifndef __WXMSW__
toolBar->AddTool(wxID_CLOSE, "Close", close_file_icon, "Close file"); toolBar->AddTool(wxID_CLOSE, "Close", close_file_icon, "Close file");
#endif #endif
toolBar->AddSeparator(); toolBar->AddSeparator();
@ -197,7 +197,7 @@ void MainFrame::OnClose(wxAuiNotebookEvent &event)
if (Msgbox_Choice == wxCANCEL) if (Msgbox_Choice == wxCANCEL)
{ {
event.Veto(); return event.Veto();
} }
else if (Msgbox_Choice == wxYES) else if (Msgbox_Choice == wxYES)
{ {
@ -205,10 +205,10 @@ void MainFrame::OnClose(wxAuiNotebookEvent &event)
if (editor->IsModified()) if (editor->IsModified())
{ {
wxMessageBox(_("File could not be saved"), _("Error"), wxOK | wxICON_EXCLAMATION); wxMessageBox(_("File could not be saved"), _("Error"), wxOK | wxICON_EXCLAMATION);
event.Veto(); return event.Veto();
}
} }
} }
};
} }
void MainFrame::OnClosed(wxAuiNotebookEvent &WXUNUSED(event)) void MainFrame::OnClosed(wxAuiNotebookEvent &WXUNUSED(event))
@ -224,6 +224,11 @@ void MainFrame::OnCloseTab(wxCommandEvent &WXUNUSED(event))
int current_tab = notebook->GetSelection(); int current_tab = notebook->GetSelection();
notebook->DeletePage(current_tab); notebook->DeletePage(current_tab);
if (notebook->GetPageCount() == 0)
{
this->EnableEditControls(false);
}
} }
void MainFrame::OnSave(wxCommandEvent &WXUNUSED(event)) void MainFrame::OnSave(wxCommandEvent &WXUNUSED(event))