Fixed some crashing code in dialog cleanup in some exceptional cases

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

samples/db/dbtest.cpp

@@ -401,19 +401,19 @@ 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);
+        pEditorDlg->Initialize();
-        DemoFrame->Close();
-    }
-
         if (!pEditorDlg->initialized)
         {
             pEditorDlg->Close();
-        pEditorDlg = NULL;
+            delete pEditorDlg;
             wxMessageBox("Unable to initialize the editor dialog for some reason","Error...",wxOK | wxICON_EXCLAMATION);
-        DemoFrame->Close(TRUE);
+            DemoFrame->Close();
+        }
+    } else
+	 {
+       wxMessageBox("Unable to create the editor dialog for some reason","Error...",wxOK | wxICON_EXCLAMATION);
+       DemoFrame->Close();
 	 }
 }  // DatabaseDemoFrame::BuildEditorDialog()
 
@@ -1481,10 +1481,16 @@ void CparameterDlg::OnCloseWindow(wxCloseEvent& event)
         wxGetApp().params = savedParamSettings;
     }
 
-//    if (GetParent() != NULL)
+    if (GetParent() != NULL)
-//        GetParent()->SetFocus();
+        GetParent()->SetFocus();
-    this->Destroy();
 
+    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()