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

Fixed some crashing code in dialog cleanup in some exceptional cases

Browse Source 
Fixed memory leak
Set return codes on the modal dialogs to avoid use of uninitialized values


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2000-08-04 11:03:22 +00:00
parent 50dce4e225
commit 386cd1e43b
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
samples/db/dbtest.cpp
View File

@@ -401,20 +401,20 @@ void DatabaseDemoFrame::BuildEditorDialog()
pEditorDlg = NULL;
pEditorDlg = new CeditorDlg(this);
if (pEditorDlg)
{
pEditorDlg->Initialize();
else
{
wxMessageBox("Unable to create the editor dialog for some reason","Error...",wxOK | wxICON_EXCLAMATION);
DemoFrame->Close();
}
if (!pEditorDlg->initialized)
{
pEditorDlg->Close();
pEditorDlg = NULL;
wxMessageBox("Unable to initialize the editor dialog for some reason","Error...",wxOK | wxICON_EXCLAMATION);
DemoFrame->Close(TRUE);
}
if (!pEditorDlg->initialized)
{
pEditorDlg->Close();
delete pEditorDlg;
wxMessageBox("Unable to initialize the editor dialog for some reason","Error...",wxOK | wxICON_EXCLAMATION);
DemoFrame->Close();
}
} else
{
wxMessageBox("Unable to create the editor dialog for some reason","Error...",wxOK | wxICON_EXCLAMATION);
DemoFrame->Close();
}
} // DatabaseDemoFrame::BuildEditorDialog()
@@ -921,7 +921,7 @@ bool CeditorDlg::Initialize()
{
// Table does exist, or there was some problem opening it. Currently this should
// never fail, except in the case of the table not exisiting or the current
// user has insufficent privileges to access the table
// user has insufficent privileges to access the table
#if 0
// This code is experimenting with a new function that will hopefully be available
@@ -1471,20 +1471,26 @@ void CparameterDlg::OnCloseWindow(wxCloseEvent& event)
if (!saved)
{
bool Ok = (wxMessageBox("No changes have been saved.\n\nAre you sure you wish exit the parameter screen?","Confirm",wxYES_NO|wxICON_QUESTION) == wxYES);
if (!Ok)
{
event.Veto();
return;
}
wxGetApp().params = savedParamSettings;
}
// if (GetParent() != NULL)
// GetParent()->SetFocus();
this->Destroy();
if (GetParent() != NULL)
GetParent()->SetFocus();
while (wxIsBusy())
wxEndBusyCursor();
Show(FALSE);
SetReturnCode(0); // added so BoundsChecker would not report use of uninitialized variable
this->Destroy();
} // CparameterDlg::OnCloseWindow()
@@ -1641,6 +1647,8 @@ void CparameterDlg::FillDataSourceList()
int i;
for (i = 0; wxStrlen(p[i]); i++)
pParamODBCSourceList->Append(p[i]);
delete p;
} // CparameterDlg::CparameterDlg::FillDataSourceList()
@@ -2005,8 +2013,9 @@ void CqueryDlg::OnCloseWindow(wxCloseEvent& event)
wxEndBusyCursor();
Show(FALSE);
this->Destroy();
SetReturnCode(1); // added so BoundsChecker would not report use of uninitialized variable
this->Destroy();
} // CqueryDlg::OnCloseWindow()