mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 21:35:39 +00:00
Fix bug #58343. Make the signal connection while the superwin is still alive and don't explicitly remove the reference from the toplevel window. r=pavlov sr=brendan
This commit is contained in:
parent
73fe6e57b7
commit
86540dd66a
@ -304,12 +304,6 @@ nsWindow::DestroyNative(void)
|
||||
IMEDestroyIC();
|
||||
#endif // USE_XIM
|
||||
|
||||
GtkWidget *top_mozarea = GetMozArea();
|
||||
if (top_mozarea) {
|
||||
GtkWidget *top_window = gtk_widget_get_toplevel(top_mozarea);
|
||||
gtk_signal_disconnect_by_data(GTK_OBJECT(top_window), this);
|
||||
}
|
||||
|
||||
// destroy all of the children that are nsWindow() classes
|
||||
// preempting the gdk destroy system.
|
||||
DestroyNativeChildren();
|
||||
@ -1881,10 +1875,11 @@ NS_METHOD nsWindow::CreateNative(GtkObject *parentWidget)
|
||||
GtkWidget *top_mozarea = GetMozArea();
|
||||
if (top_mozarea) {
|
||||
GtkWidget *top_window = gtk_widget_get_toplevel(top_mozarea);
|
||||
gtk_signal_connect_after(GTK_OBJECT(top_window),
|
||||
"configure_event",
|
||||
GTK_SIGNAL_FUNC(handle_invalidate_pos),
|
||||
this);
|
||||
gtk_signal_connect_while_alive(GTK_OBJECT(top_window),
|
||||
"configure_event",
|
||||
GTK_SIGNAL_FUNC(handle_invalidate_pos),
|
||||
this,
|
||||
GTK_OBJECT(mSuperWin));
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user