diff src/layout.c @ 1810:c416d099a3dc

GTK marks several functions as deprecated The following functions has been replaced and deprecated by version 2.20: - GTK_WIDGET_CAN_FOCUS - GTK_WIDGET_DRAWABLE - GTK_WIDGET_HAS_FOCUS - GTK_WIDGET_HAS_GRAB - GTK_WIDGET_IS_SENSITIVE - GTK_WIDGET_NO_WINDOW - GTK_WIDGET_REALIZED - GTK_WIDGET_SENSITIVE - GTK_WIDGET_STATE - GTK_WIDGET_TOPLEVEL - GTK_WIDGET_VISIBLE

--- a/src/layout.c	Sun Feb 28 22:55:37 2010 +0000
+++ b/src/layout.c	Mon May 10 11:32:56 2010 +0000
@@ -1143,7 +1143,11 @@
 {
 	if (!layout_valid(&lw)) return FALSE;
 
+#if GTK_CHECK_VERSION(2,20,0)
+	if (!lw->tools || !gtk_widget_get_visible(lw->tools))
+#else
 	if (!lw->tools || !GTK_WIDGET_VISIBLE(lw->tools))
+#endif
 		{
 		/* use the stored values (sort of breaks success return value) */
 
@@ -1179,7 +1183,11 @@
 
 	if (hide)
 		{
+#if GTK_CHECK_VERSION(2,20,0)
+		if (gtk_widget_get_visible(lw->tools))
+#else
 		if (GTK_WIDGET_VISIBLE(lw->tools))
+#endif
 			{
 			layout_tools_geometry_sync(lw);
 			gtk_widget_hide(lw->tools);
@@ -1187,7 +1195,11 @@
 		}
 	else
 		{
+#if GTK_CHECK_VERSION(2,20,0)
+		if (!gtk_widget_get_visible(lw->tools))
+#else
 		if (!GTK_WIDGET_VISIBLE(lw->tools))
+#endif
 			{
 			gtk_widget_show(lw->tools);
 			if (lw->vf) vf_refresh(lw->vf);
@@ -1713,11 +1725,19 @@
 
 	if (lw->options.toolbar_hidden)
 		{
+#if GTK_CHECK_VERSION(2,20,0)
+		if (gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
+#else
 		if (GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
+#endif
 		}
 	else
 		{
+#if GTK_CHECK_VERSION(2,20,0)
+		if (!gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]);
+#else
 		if (!GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]);
+#endif
 		}
 }