AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Add more toplevel window checks

Browse Source
This commit is contained in:
Richard Hult 2009-01-05 20:35:25 +01:00 committed by Alexander Larsson
parent 93d1d51e3b
commit 4cf7fe5832
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/quartz/gdkwindow-quartz.c
View File

@ -2099,10 +2099,10 @@ gdk_window_set_title (GdkWindow *window,
{ {
GdkWindowImplQuartz *impl; GdkWindowImplQuartz *impl;
g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (title != NULL); g_return_if_fail (title != NULL);
if (GDK_WINDOW_DESTROYED (window)) if (GDK_WINDOW_DESTROYED (window) ||
WINDOW_IS_TOPLEVEL (window))
return; return;
impl = GDK_WINDOW_IMPL_QUARTZ (((GdkWindowObject *)window)->impl); impl = GDK_WINDOW_IMPL_QUARTZ (((GdkWindowObject *)window)->impl);
@ -2119,6 +2119,10 @@ void
gdk_window_set_role (GdkWindow *window, gdk_window_set_role (GdkWindow *window,
const gchar *role) const gchar *role)
{ {
if (GDK_WINDOW_DESTROYED (window) ||
WINDOW_IS_TOPLEVEL (window))
return;
/* FIXME: Implement */ /* FIXME: Implement */
} }
@ -2129,8 +2133,8 @@ gdk_window_set_transient_for (GdkWindow *window,
GdkWindowImplQuartz *window_impl; GdkWindowImplQuartz *window_impl;
GdkWindowImplQuartz *parent_impl; GdkWindowImplQuartz *parent_impl;
if (GDK_WINDOW_DESTROYED (window) || GDK_WINDOW_DESTROYED (parent)) if (!GDK_WINDOW_DESTROYED (window) && !GDK_WINDOW_DESTROYED (parent) &&
return; WINDOW_IS_TOPLEVEL (window))
window_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); window_impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl);
if (!window_impl->toplevel) if (!window_impl->toplevel)