---
clutter-gtk/gtk-clutter-embed.c | 6 +++---
clutter-gtk/gtk-clutter-offscreen.c | 6 +++---
clutter-gtk/gtk-clutter-standin.c | 4 ++--
clutter-gtk/gtk-clutter-util.c | 4 ++--
configure.ac | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c
index 483ab75..7bd35e8 100644
--- a/clutter-gtk/gtk-clutter-embed.c
+++ b/clutter-gtk/gtk-clutter-embed.c
@@ -141,7 +141,7 @@ gtk_clutter_embed_show (GtkWidget *widget)
{
GtkClutterEmbedPrivate *priv = GTK_CLUTTER_EMBED (widget)->priv;
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
clutter_actor_show (priv->stage);
GTK_WIDGET_CLASS (gtk_clutter_embed_parent_class)->show (widget);
@@ -257,7 +257,7 @@ gtk_clutter_embed_realize (GtkWidget *widget)
clutter_actor_realize (priv->stage);
- if (GTK_WIDGET_VISIBLE (widget))
+ if (gtk_widget_get_visible (widget))
clutter_actor_show (priv->stage);
gtk_clutter_embed_send_configure (GTK_CLUTTER_EMBED (widget));
@@ -281,7 +281,7 @@ gtk_clutter_embed_size_allocate (GtkWidget *widget,
widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
diff --git a/clutter-gtk/gtk-clutter-offscreen.c
b/clutter-gtk/gtk-clutter-offscreen.c
index cb7ee46..4c26798 100644
--- a/clutter-gtk/gtk-clutter-offscreen.c
+++ b/clutter-gtk/gtk-clutter-offscreen.c
@@ -232,7 +232,7 @@ gtk_clutter_offscreen_size_request (GtkWidget *widget,
requisition->width = (GTK_CONTAINER (widget)->border_width * 2);
requisition->height = (GTK_CONTAINER (widget)->border_width * 2);
- if (GTK_BIN (widget)->child && GTK_WIDGET_VISIBLE (GTK_BIN (widget)->child))
+ if (GTK_BIN (widget)->child && gtk_widget_get_visible (GTK_BIN
(widget)->child))
{
GtkRequisition child_requisition;
@@ -257,7 +257,7 @@ gtk_clutter_offscreen_size_allocate (GtkWidget *widget,
* Calling gdk_window_move_resize() triggers an expose-event of the entire
* widget tree, so we only want to do it if the allocation has changed in
* some way, otherwise we can just ignore it. */
- if (GTK_WIDGET_REALIZED (widget) &&
+ if (gtk_widget_get_realized (widget) &&
(allocation->x != widget->allocation.x ||
allocation->y != widget->allocation.y ||
allocation->width != widget->allocation.width ||
@@ -272,7 +272,7 @@ gtk_clutter_offscreen_size_allocate (GtkWidget *widget,
widget->allocation = *allocation;
border_width = GTK_CONTAINER (widget)->border_width;
- if (GTK_BIN (offscreen)->child && GTK_WIDGET_VISIBLE (GTK_BIN
(offscreen)->child))
+ if (GTK_BIN (offscreen)->child && gtk_widget_get_visible (GTK_BIN
(offscreen)->child))
{
GtkAllocation child_allocation;
diff --git a/clutter-gtk/gtk-clutter-standin.c
b/clutter-gtk/gtk-clutter-standin.c
index 72159a2..b8ecf44 100644
--- a/clutter-gtk/gtk-clutter-standin.c
+++ b/clutter-gtk/gtk-clutter-standin.c
@@ -237,7 +237,7 @@ gtk_clutter_standin_realize (GtkWidget *widget)
clutter_actor_realize (priv->bin);
- if (GTK_WIDGET_VISIBLE (widget))
+ if (gtk_widget_get_visible (widget))
clutter_actor_show (priv->bin);
gtk_clutter_standin_send_configure (GTK_CLUTTER_STANDIN (widget));
@@ -272,7 +272,7 @@ gtk_clutter_standin_size_allocate (GtkWidget *widget,
widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
index 1027f18..d20b145 100644
--- a/clutter-gtk/gtk-clutter-util.c
+++ b/clutter-gtk/gtk-clutter-util.c
@@ -810,7 +810,7 @@ gtk_clutter_calculate_root_allocation (GtkWidget
*widget,
for (parent = widget->parent; parent != NULL; parent = parent->parent)
{
- if (!GTK_WIDGET_NO_WINDOW (parent))
+ if (!gtk_widget_get_has_window (parent))
{
/* add this allocation */
allocation->x += parent->allocation.x;
@@ -855,7 +855,7 @@ gtk_clutter_calculate_actor_allocation (GtkWidget
*widget,
{
break;
}
- else if (!GTK_WIDGET_NO_WINDOW (parent))
+ else if (!gtk_widget_get_has_window (parent))
{
/* add this allocation */
allocation->x += parent->allocation.x;
diff --git a/configure.ac b/configure.ac
index 5ee1d16..1776623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ AC_DISABLE_STATIC
AC_PROG_LIBTOOL
m4_define([clutter_req_version], [1.1.13])
-m4_define([gtk_req_version], [2.17.9])
+m4_define([gtk_req_version], [2.19.5])
m4_define([flavour_default], [x11])
AC_ARG_WITH([flavour],
[AC_HELP_STRING([--with-flavour=@<:@x11/win32@:>@],
--
1.6.6.1
--
To unsubscribe send a mail to [email protected]
