Implememted IsBeingDeleted() -> buttons work again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-11 08:23:53 +00:00
parent 162b0c3bf5
commit 31c6b4fc10
9 changed files with 12 additions and 15 deletions

View File

@@ -245,6 +245,8 @@ bool wxDialog::Create( wxWindow *parent,
wxDialog::~wxDialog()
{
m_isBeingDeleted = TRUE;
wxTopLevelWindows.DeleteObject( this );
if (wxTheApp->GetTopWindow() == this)
@@ -290,18 +292,14 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
{
printf( "OnOK 1.\n" );
if (Validate() && TransferDataFromWindow())
{
printf( "OnOK 2.\n" );
if (IsModal())
{
printf( "OnOK: modal.\n" );
EndModal(wxID_OK);
}
else
{
printf( "OnOK: non-modal.\n" );
SetReturnCode(wxID_OK);
this->Show(FALSE);
}