[gthumb] Build with gtk > 2.19.3 (GTK_WIDGET_TOPLEVEL -> gtk_widget_is_toplevel)
- From: Funda Wang <fwang src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gthumb] Build with gtk > 2.19.3 (GTK_WIDGET_TOPLEVEL -> gtk_widget_is_toplevel)
- Date: Sun, 24 Jan 2010 03:16:51 +0000 (UTC)
commit a4b16a8bebc644f95179c9b1a391768b7709cd96
Author: Funda Wang <fundawang gmail com>
Date: Sun Jan 24 04:15:39 2010 +0100
Build with gtk > 2.19.3 (GTK_WIDGET_TOPLEVEL -> gtk_widget_is_toplevel)
gthumb/eggfileformatchooser.c | 5 +++++
gthumb/gth-file-tool.c | 4 ++++
gthumb/gth-tags-entry.c | 6 +++++-
3 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/gthumb/eggfileformatchooser.c b/gthumb/eggfileformatchooser.c
index 09f0872..cd6506b 100644
--- a/gthumb/eggfileformatchooser.c
+++ b/gthumb/eggfileformatchooser.c
@@ -632,7 +632,12 @@ get_toplevel (GtkWidget *widget)
GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (widget);
+
+#if GTK_CHECK_VERSION (2, 19, 3)
+ if (!gtk_widget_is_toplevel (toplevel))
+#else
if (!GTK_WIDGET_TOPLEVEL (toplevel))
+#endif
return NULL;
else
return GTK_WINDOW (toplevel);
diff --git a/gthumb/gth-file-tool.c b/gthumb/gth-file-tool.c
index 45b42c5..60f6ed6 100644
--- a/gthumb/gth-file-tool.c
+++ b/gthumb/gth-file-tool.c
@@ -194,7 +194,11 @@ gth_file_tool_get_window (GthFileTool *self)
{
if (self->priv->window == NULL) {
self->priv->window = gtk_widget_get_toplevel (GTK_WIDGET (self));
+#if GTK_CHECK_VERSION (2, 19, 3)
+ if (! gtk_widget_is_toplevel (self->priv->window))
+#else
if (! GTK_WIDGET_TOPLEVEL (self->priv->window))
+#endif
self->priv->window = NULL;
}
return self->priv->window;
diff --git a/gthumb/gth-tags-entry.c b/gthumb/gth-tags-entry.c
index a5cc024..d77b255 100644
--- a/gthumb/gth-tags-entry.c
+++ b/gthumb/gth-tags-entry.c
@@ -614,7 +614,11 @@ tag_list_unmap_cb (GtkWidget *widget,
GdkGeometry geometry;
toplevel = gtk_widget_get_toplevel (widget);
- if (! GTK_WIDGET_TOPLEVEL (toplevel))
+#if GTK_CHECK_VERSION (2, 19, 3)
+ if (! gtk_widget_is_toplevel (toplevel))
+#else
+ if (! GTK_WIDGET_TOPLEVEL (toplevel))
+#endif
return;
geometry.max_height = -1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]