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

21
src/generic/proplist.cpp
View File

@@ -808,6 +808,7 @@ IMPLEMENT_CLASS(wxPropertyListDialog, wxDialog)
BEGIN_EVENT_TABLE(wxPropertyListDialog, wxDialog)
EVT_BUTTON(wxID_CANCEL, wxPropertyListDialog::OnCancel)
EVT_CLOSE(wxPropertyListDialog::OnCloseWindow)
END_EVENT_TABLE()
wxPropertyListDialog::wxPropertyListDialog(wxPropertyListView *v, wxWindow *parent,
@@ -821,17 +822,19 @@ wxPropertyListDialog::wxPropertyListDialog(wxPropertyListView *v, wxWindow *pare
SetAutoLayout(TRUE);
}
bool wxPropertyListDialog::OnClose(void)
void wxPropertyListDialog::OnCloseWindow(wxCloseEvent& event)
{
if (m_view)
{
SetReturnCode(wxID_CANCEL);
m_view->OnClose();
m_view = NULL;
return TRUE;
this->Destroy();
}
else
return FALSE;
{
event.Veto();
}
}
void wxPropertyListDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
@@ -899,7 +902,11 @@ void wxPropertyListPanel::OnSize(wxSizeEvent& WXUNUSED(event))
IMPLEMENT_CLASS(wxPropertyListFrame, wxFrame)
bool wxPropertyListFrame::OnClose(void)
BEGIN_EVENT_TABLE(wxPropertyListFrame, wxFrame)
EVT_CLOSE(wxPropertyListFrame::OnCloseWindow)
END_EVENT_TABLE()
void wxPropertyListFrame::OnCloseWindow(wxCloseEvent& event)
{
if (m_view)
{
@@ -907,10 +914,12 @@ bool wxPropertyListFrame::OnClose(void)
m_propertyPanel->SetView(NULL);
m_view->OnClose();
m_view = NULL;
return TRUE;
this->Destroy();
}
else
return FALSE;
{
event.Veto();
}
}
wxPropertyListPanel *wxPropertyListFrame::OnCreatePanel(wxFrame *parent, wxPropertyListView *v)