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

window: don't confuse priv->type_hint with priv->gdk_type_hint

Browse Source 
This broke, among the others, menu rendering.
This commit is contained in:
Cosimo Cecchi 2011-03-02 16:06:09 -05:00
parent ee43f55b5f
commit 4a99e75ce7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkwindow.c
View File

@ -2648,12 +2648,12 @@ gtk_window_set_type_hint (GtkWindow *window,
priv = window->priv;
if (hint < GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU)
priv->gdk_type_hint = hint;
priv->type_hint = hint;
else
priv->gdk_type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
priv->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
priv->reset_type_hint = TRUE;
priv->type_hint = hint;
priv->gdk_type_hint = hint;
}
/**
@ -2669,7 +2669,7 @@ gtk_window_get_type_hint (GtkWindow *window)
{
g_return_val_if_fail (GTK_IS_WINDOW (window), GDK_WINDOW_TYPE_HINT_NORMAL);
return window->priv->type_hint;
return window->priv->gdk_type_hint;
}
/**
@ -4705,7 +4705,7 @@ gtk_window_map (GtkWidget *widget)
* Some applications use X directly to change the properties;
* in that case, we shouldn't overwrite what they did.
*/
gdk_window_set_type_hint (gdk_window, priv->type_hint);
gdk_window_set_type_hint (gdk_window, priv->gdk_type_hint);
priv->reset_type_hint = FALSE;
}