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/gtkdnd-quartz.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/gtkdnd-quartz.c')
| -rw-r--r-- | gtk/gtkdnd-quartz.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c index e00ef203cd..3cd4fb3f48 100644 --- a/gtk/gtkdnd-quartz.c +++ b/gtk/gtkdnd-quartz.c @@ -357,7 +357,7 @@ gtk_drag_highlight_expose (GtkWidget *widget, { cairo_t *cr; - if (GTK_WIDGET_NO_WINDOW (widget)) + if (!gtk_widget_get_has_window (widget)) { x = widget->allocation.x; y = widget->allocation.y; @@ -434,7 +434,7 @@ get_toplevel_nswindow (GtkWidget *widget) { GtkWidget *toplevel = gtk_widget_get_toplevel (widget); - if (GTK_WIDGET_TOPLEVEL (toplevel) && toplevel->window) + if (gtk_widget_is_toplevel (toplevel) && toplevel->window) return [gdk_quartz_window_get_nsview (toplevel->window) window]; else return NULL; @@ -697,7 +697,7 @@ gtk_drag_find_widget (GtkWidget *widget, allocation_to_window_x = widget->allocation.x; allocation_to_window_y = widget->allocation.y; - if (!GTK_WIDGET_NO_WINDOW (widget)) + if (gtk_widget_get_has_window (widget)) { /* The allocation is relative to the parent window for * window widgets, not to widget->window. |