[gtk+] window: don't confuse priv->type_hint with priv->gdk_type_hint
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] window: don't confuse priv->type_hint with priv->gdk_type_hint
- Date: Thu, 3 Mar 2011 22:49:50 +0000 (UTC)
commit 4a99e75ce7d94dab3bea16ee62ec24c033826aea
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Mar 2 16:06:09 2011 -0500
window: don't confuse priv->type_hint with priv->gdk_type_hint
This broke, among the others, menu rendering.
gtk/gtkwindow.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c996362..31590a8 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]