Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug #79022. Make sure to remove listeners after the widget is destroyed so the toplevel window doesn't call back down into an undestroyed widget. r/sr=dbaron,tor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@95208 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blizzard%redhat.com 2001-05-17 03:49:24 +00:00
parent 54b03a00ff
commit bc93d81547
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/widget/src/gtksuperwin/gtkmozarea.c
View File

@ -25,6 +25,7 @@ static void gtk_mozarea_realize (GtkWidget *widget);
static void gtk_mozarea_unrealize (GtkWidget *widget);
static void gtk_mozarea_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_mozarea_destroy (GtkObject *object);
static void
attach_toplevel_listener(GtkMozArea *mozarea);
@ -85,6 +86,8 @@ gtk_mozarea_class_init (GtkMozAreaClass *klass)
widget_class->unrealize = gtk_mozarea_unrealize;
widget_class->size_allocate = gtk_mozarea_size_allocate;
object_class->destroy = gtk_mozarea_destroy;
parent_class = gtk_type_class(gtk_widget_get_type());
/* set up our signals */
@ -112,6 +115,7 @@ gtk_mozarea_init (GtkMozArea *mozarea)
{
mozarea->superwin = NULL;
mozarea->toplevel_focus = FALSE;
mozarea->toplevel_window = NULL;
}
static void
@ -179,6 +183,22 @@ gtk_mozarea_size_allocate (GtkWidget *widget,
}
}
static void
gtk_mozarea_destroy(GtkObject *object)
{
GtkMozArea *mozarea;
g_return_if_fail(GTK_IS_MOZAREA(object));
mozarea = GTK_MOZAREA(object);
/* remove the filter on the toplevel window */
gdk_window_remove_filter(mozarea->toplevel_window, toplevel_window_filter,
mozarea);
GTK_OBJECT_CLASS(parent_class)->destroy(object);
}
GtkWidget*
gtk_mozarea_new (GdkWindow *parent_window)
{
@ -220,6 +240,10 @@ attach_toplevel_listener(GtkMozArea *mozarea)
automatically be removed. */
gdk_window_add_filter(gdk_window, toplevel_window_filter, mozarea);
/* save it so that we can remove the filter later */
mozarea->toplevel_window = gdk_window;
}
/* this function will try to find the real toplevel for a gdk window. */

3
mozilla/widget/src/gtksuperwin/gtkmozarea.h
View File

@ -39,6 +39,9 @@ struct _GtkMozArea
GtkWidget widget;
GdkSuperWin *superwin;
gboolean toplevel_focus;
/* store away the toplevel window */
GdkWindow *toplevel_window;
};
struct _GtkMozAreaClass