diff options
| author | Christian Dywan <christian@twotoasts.de> | 2010-01-04 07:49:26 +0100 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2010-01-04 07:57:05 +0100 |
| commit | bb1824c131f247c2ef64f3c5f8b9ffe3885c9d90 (patch) | |
| tree | 4a3b900d5f439856679fd0fcf9c8394c177e8c6f /gtk/gtktooltip.c | |
| parent | ac26960e62346558737073ac516790005d7c64ad (diff) | |
| download | gtk+-bb1824c131f247c2ef64f3c5f8b9ffe3885c9d90.tar.gz | |
Deprecate flag macros for toplevel, state, no window and composite child
Deprecate widget flag macros GTK_WIDGET_STATE, GTK_WIDGET_SAVED_STATE,
GTK_WIDGET_FLAGS, GTK_WIDGET_TOPLEVEL, GTK_WIDGET_NO_WINDOW and
GTK_WIDGET_COMPOSITE_CHILD.
Also deprecate the type macros GTK_WIDGET_TYPE, GTK_OBJECT_TYPE_NAME and
GTK_OBJECT_TYPE which have become redundant.
Instances of GTK_WIDGET_TOPLEVEL are replaced with gtk_widget_is_toplevel,
GTK_WIDGET_TYPE is replaced with G_OBJECT_TYPE, GTK_WIDGET_COMPOSITE_CHILD
is replaced with use of the "composite-child" property and uses of
GTK_WIDGET_NO_WINDOW are adjusted to use gtk_widget_get_has_window.
Uses of GTK_WIDGET_SAVED_STATE and GTK_WIDGET_FLAGS inside GtkWidget are
changed to direct flag usage.
Documentation is updated to refer to gtk_widget_set_has_window and
gtk_widget_get_has_window.
Gail and tests are updated as well.
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=69872
Diffstat (limited to 'gtk/gtktooltip.c')
| -rw-r--r-- | gtk/gtktooltip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index 61d71ba503..c4700fd48f 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -619,7 +619,7 @@ window_to_alloc (GtkWidget *dest_widget, gint *dest_y) { /* Translate from window relative to allocation relative */ - if (!GTK_WIDGET_NO_WINDOW (dest_widget) && dest_widget->parent) + if (gtk_widget_get_has_window (dest_widget) && dest_widget->parent) { gint wx, wy; gdk_window_get_position (dest_widget->window, &wx, &wy); @@ -874,7 +874,7 @@ gtk_tooltip_position (GtkTooltip *tooltip, if (tooltip->keyboard_mode_enabled) { gdk_window_get_origin (new_tooltip_widget->window, &x, &y); - if (GTK_WIDGET_NO_WINDOW (new_tooltip_widget)) + if (!gtk_widget_get_has_window (new_tooltip_widget)) { x += new_tooltip_widget->allocation.x; y += new_tooltip_widget->allocation.y; |