mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better compatibility with older GTK and Cairo

Browse source 
divelist.c:
Replaced "gtk_tree_path_get_indices_with_depth()" with the coupled alternative:
	int depth = gtk_tree_path_get_depth(path);
	int *indices = gtk_tree_path_get_indices(path);
for compatibility GTK+ < 2.22

*:
Replaced all usage of "cairo_rectangle_int_t" with "cairo_rectangle_t"
for compatibility with Cairo < 1.10.

Both modification make building Subsurface possible on a fairly recent Debian
distribution, which reports to have the version of the abovementioned
libraries "up-to-date", yet they are slightly outdated.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2012-09-11 01:31:01 +03:00 • committed by Dirk Hohndel
parent ae33b5ef52
commit 0fceb1c907
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
divelist.c
View file

@ -1826,8 +1826,8 @@ static void popup_divelist_menu(GtkTreeView *tree_view, GtkTreeModel *model, int
}
/* only offer trip editing options when we are displaying the tree model */
if (dive_list.model == dive_list.treemodel) {
int depth;
int *indices = gtk_tree_path_get_indices_with_depth(path, &depth);
int depth = gtk_tree_path_get_depth(path);
int *indices = gtk_tree_path_get_indices(path);
/* top level dive or child dive that is not the first child */
if (depth == 1 || indices[1] > 0) {
menuitem = gtk_menu_item_new_with_label("Create new trip above");

6
gtk-gui.c
View file

@ -971,7 +971,7 @@ void exit_ui(void)
}
typedef struct {
cairo_rectangle_int_t rect;
cairo_rectangle_t rect;
const char *text;
} tooltip_record_t;
@ -980,7 +980,7 @@ static int tooltips;
void attach_tooltip(int x, int y, int w, int h, const char *text)
{
cairo_rectangle_int_t *rect;
cairo_rectangle_t *rect;
tooltip_rects = realloc(tooltip_rects, (tooltips + 1) * sizeof(tooltip_record_t));
rect = &tooltip_rects[tooltips].rect;
rect->x = x;
@ -998,7 +998,7 @@ static gboolean profile_tooltip (GtkWidget *widget, gint x, gint y,
gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data)
{
int i;
cairo_rectangle_int_t *drawing_area = user_data;
cairo_rectangle_t *drawing_area = user_data;
gint tx = x - drawing_area->x; /* get transformed coordinates */
gint ty = y - drawing_area->y;