Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed lots of OnClose functions; doc'ed OnCloseWindow better;

Browse Source 
MM_... -> wxMM_...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-05 23:55:04 +00:00
parent cd743a6f71
commit e306597309
130 changed files with 533 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/dialoged/src/reseditr.cpp
View File

@@ -340,10 +340,8 @@ bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *WXUNUSED(parent)
else
{
wxFrame *fr = m_editorFrame;
if (m_editorFrame->OnClose())
if (m_editorFrame->Close())
{
fr->Show(FALSE);
delete fr;
m_editorFrame = NULL;
m_editorPanel = NULL;
}
@@ -2076,6 +2074,7 @@ BEGIN_EVENT_TABLE(wxResourceEditorFrame, wxFrame)
EVT_MENU(RESED_DELETE, wxResourceEditorFrame::OnDeleteSelection)
EVT_MENU(RESED_RECREATE, wxResourceEditorFrame::OnRecreateSelection)
EVT_MENU(RESED_TEST, wxResourceEditorFrame::OnTest)
EVT_CLOSE(wxResourceEditorFrame::OnCloseWindow)
END_EVENT_TABLE()
wxResourceEditorFrame::wxResourceEditorFrame(wxResourceManager *resMan, wxFrame *parent, const wxString& title,
@@ -2157,12 +2156,15 @@ void wxResourceEditorFrame::OnRecreateSelection(wxCommandEvent& WXUNUSED(event))
manager->RecreateSelection();
}
bool wxResourceEditorFrame::OnClose()
void wxResourceEditorFrame::OnCloseWindow(wxCloseEvent& event)
{
if (manager->Modified())
{
if (!manager->Clear(TRUE, FALSE))
return FALSE;
if (!manager->Clear(TRUE, FALSE))
{
event.Veto();
return;
}
}
if (!Iconized())
@@ -2181,7 +2183,7 @@ bool wxResourceEditorFrame::OnClose()
manager->SetEditorFrame(NULL);
manager->SetEditorToolBar(NULL);
return TRUE;
this->Destroy();
}
/*