From: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
Date: Fri, 30 Mar 2012 14:17:34 +0000 (+0000)
Subject: Fix #1741: Build error --with-gui, gtk problem.
X-Git-Tag: 2.0.0rc2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93993c7e7665e644577f3d1e31e4f5c666ff8a72;p=postgis

Fix #1741: Build error --with-gui, gtk problem.

Older versions of GTK (< 2.14.0) don't have gtk_dialog_get_content_area(). Work
around this by providing a compatibility #define for these older GTK versions.

git-svn-id: http://svn.osgeo.org/postgis/trunk@9582 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/loader/shp2pgsql-gui.c b/loader/shp2pgsql-gui.c
index 4913d8aa6..8b195693a 100644
--- a/loader/shp2pgsql-gui.c
+++ b/loader/shp2pgsql-gui.c
@@ -37,6 +37,13 @@ static void pgui_seterr_va(const char *fmt, va_list ap);
 
 static void update_conn_ui_from_conn_config(void);
 
+/* If GTK+ version is < 2.14.0, define gtk_dialog_get_content_area() */
+#if !GTK_CHECK_VERSION(2, 14, 0)
+	#if !defined(gtk_dialog_get_content_area)
+		#define gtk_dialog_get_content_area(dialog) GTK_DIALOG(dialog)->vbox
+	#endif
+#endif
+
 /*
 ** Global variables for GUI only
 */