Mercurial > geeqie
comparison src/ui_tree_edit.c @ 1043:5fc64d6252e7
Replaced gtk depreceated code.
author | bruclik |
---|---|
date | Sun, 07 Sep 2008 23:01:30 +0000 |
parents | 419fe0574a34 |
children | e34e9bdef276 |
comparison
equal
deleted
inserted
replaced
1042:e59a9c96d290 | 1043:5fc64d6252e7 |
---|---|
264 | 264 |
265 /* hmm, appears the rect will not account for X scroll, but does for Y scroll | 265 /* hmm, appears the rect will not account for X scroll, but does for Y scroll |
266 * use x_offset instead for X scroll (sigh) | 266 * use x_offset instead for X scroll (sigh) |
267 */ | 267 */ |
268 gtk_tree_view_get_cell_area(widget, tpath, tv_column, &rect); | 268 gtk_tree_view_get_cell_area(widget, tpath, tv_column, &rect); |
269 #if GTK_CHECK_VERSION(2,12,0) | |
270 gtk_tree_view_convert_bin_window_to_widget_coords(widget, 0, 0, &x_offset, &y_offset); | |
271 #else | |
269 gtk_tree_view_tree_to_widget_coords(widget, 0, 0, &x_offset, &y_offset); | 272 gtk_tree_view_tree_to_widget_coords(widget, 0, 0, &x_offset, &y_offset); |
273 #endif | |
270 gdk_window_get_origin(GTK_WIDGET(widget)->window, &x_origin, &y_origin); | 274 gdk_window_get_origin(GTK_WIDGET(widget)->window, &x_origin, &y_origin); |
271 | 275 |
272 if (gtk_tree_view_get_headers_visible(widget)) | 276 if (gtk_tree_view_get_headers_visible(widget)) |
273 { | 277 { |
274 header_size = tv_column->button->allocation.height; | 278 header_size = tv_column->button->allocation.height; |
356 | 360 |
357 gtk_tree_view_get_visible_rect(widget, &vrect); | 361 gtk_tree_view_get_visible_rect(widget, &vrect); |
358 gtk_tree_view_get_cell_area(widget, tpath, NULL, &crect); | 362 gtk_tree_view_get_cell_area(widget, tpath, NULL, &crect); |
359 gtk_tree_path_free(tpath); | 363 gtk_tree_path_free(tpath); |
360 | 364 |
365 | |
366 #if GTK_CHECK_VERSION(2,12,0) | |
367 gtk_tree_view_convert_bin_window_to_widget_coords(widget, crect.x, crect.y, &cx, &cy); | |
368 #else | |
361 gtk_tree_view_widget_to_tree_coords(widget, crect.x, crect.y, &cx, &cy); | 369 gtk_tree_view_widget_to_tree_coords(widget, crect.x, crect.y, &cx, &cy); |
370 #endif | |
362 | 371 |
363 if (fully_visible) | 372 if (fully_visible) |
364 { | 373 { |
365 if (cy < vrect.y) return -1; | 374 if (cy < vrect.y) return -1; |
366 if (cy + crect.height > vrect.y + vrect.height) return 1; | 375 if (cy + crect.height > vrect.y + vrect.height) return 1; |