Mercurial > geeqie

comparison src/layout.c @ 1810:c416d099a3dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author mow
date Mon, 10 May 2010 11:32:56 +0000
parents 956aab097ea7
children
comparison
equal deleted inserted replaced
1809:e1c18f81e637 1810:c416d099a3dc
1141 1141
1142 gboolean layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h, gint *divider_pos) 1142 gboolean layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h, gint *divider_pos)
1143 { 1143 {
1144 if (!layout_valid(&lw)) return FALSE; 1144 if (!layout_valid(&lw)) return FALSE;
1145 1145
1146 #if GTK_CHECK_VERSION(2,20,0)
1147 if (!lw->tools || !gtk_widget_get_visible(lw->tools))
1148 #else
1146 if (!lw->tools || !GTK_WIDGET_VISIBLE(lw->tools)) 1149 if (!lw->tools || !GTK_WIDGET_VISIBLE(lw->tools))
1150 #endif
1147 { 1151 {
1148 /* use the stored values (sort of breaks success return value) */ 1152 /* use the stored values (sort of breaks success return value) */
1149 1153
1150 *divider_pos = lw->options.float_window.vdivider_pos; 1154 *divider_pos = lw->options.float_window.vdivider_pos;
1151 1155
1177 { 1181 {
1178 if (!lw->tools) return; 1182 if (!lw->tools) return;
1179 1183
1180 if (hide) 1184 if (hide)
1181 { 1185 {
1186 #if GTK_CHECK_VERSION(2,20,0)
1187 if (gtk_widget_get_visible(lw->tools))
1188 #else
1182 if (GTK_WIDGET_VISIBLE(lw->tools)) 1189 if (GTK_WIDGET_VISIBLE(lw->tools))
1190 #endif
1183 { 1191 {
1184 layout_tools_geometry_sync(lw); 1192 layout_tools_geometry_sync(lw);
1185 gtk_widget_hide(lw->tools); 1193 gtk_widget_hide(lw->tools);
1186 } 1194 }
1187 } 1195 }
1188 else 1196 else
1189 { 1197 {
1198 #if GTK_CHECK_VERSION(2,20,0)
1199 if (!gtk_widget_get_visible(lw->tools))
1200 #else
1190 if (!GTK_WIDGET_VISIBLE(lw->tools)) 1201 if (!GTK_WIDGET_VISIBLE(lw->tools))
1202 #endif
1191 { 1203 {
1192 gtk_widget_show(lw->tools); 1204 gtk_widget_show(lw->tools);
1193 if (lw->vf) vf_refresh(lw->vf); 1205 if (lw->vf) vf_refresh(lw->vf);
1194 } 1206 }
1195 } 1207 }
1711 1723
1712 lw->options.toolbar_hidden = !lw->options.toolbar_hidden; 1724 lw->options.toolbar_hidden = !lw->options.toolbar_hidden;
1713 1725
1714 if (lw->options.toolbar_hidden) 1726 if (lw->options.toolbar_hidden)
1715 { 1727 {
1728 #if GTK_CHECK_VERSION(2,20,0)
1729 if (gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
1730 #else
1716 if (GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]); 1731 if (GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
1732 #endif
1717 } 1733 }
1718 else 1734 else
1719 { 1735 {
1736 #if GTK_CHECK_VERSION(2,20,0)
1737 if (!gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]);
1738 #else
1720 if (!GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]); 1739 if (!GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]);
1740 #endif
1721 } 1741 }
1722 } 1742 }
1723 1743
1724 void layout_info_pixel_set(LayoutWindow *lw, gboolean show) 1744 void layout_info_pixel_set(LayoutWindow *lw, gboolean show)
1725 { 1745 {