Re-applied code for 4560. Reviewed by ramiro, kipp.

git-svn-id: svn://10.0.0.236/trunk@26855 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
syd%netscape.com 1999-04-09 02:01:34 +00:00
parent 0848b84362
commit 73f8900785

View File

@ -148,10 +148,14 @@ NS_METHOD nsWindow::RemoveTooltips()
NS_METHOD nsWindow::Destroy()
{
// Call base class first...
nsWidget::Destroy();
// Call base class first... we need to ensure that upper management
// knows about the close so that if this is the main application
// window, for example, the application will exit as it should.
if (mIsDestroying == PR_TRUE) {
nsBaseWidget::Destroy();
if (PR_FALSE == mOnDestroyCalled)
nsWidget::OnDestroy();
if (mShell) {
if (GTK_IS_WIDGET(mShell))
gtk_widget_destroy(mShell);
@ -162,7 +166,6 @@ NS_METHOD nsWindow::Destroy()
return NS_OK;
}
gint handle_delete_event(GtkWidget *w, GdkEventAny *e, nsWindow *win)
{
win->SetIsDestroying( PR_TRUE );