Commit 2e747f07a23ed3789ad73b4d1fbcf09fee401060
1 parent
cf70641e
Exists in
master
and in
4 other branches
Fixing gtk version issues.
Showing
1 changed file
with
7 additions
and
2 deletions
Show diff stats
src/objects/window/page.c
@@ -83,7 +83,12 @@ | @@ -83,7 +83,12 @@ | ||
83 | 83 | ||
84 | gtk_menu_attach_to_widget(GTK_MENU(menu), GTK_WIDGET(label), popup_menu_detach); | 84 | gtk_menu_attach_to_widget(GTK_MENU(menu), GTK_WIDGET(label), popup_menu_detach); |
85 | g_signal_emit_by_name(GTK_LABEL(label),"populate-popup",menu); | 85 | g_signal_emit_by_name(GTK_LABEL(label),"populate-popup",menu); |
86 | + | ||
87 | +#if GTK_CHECK_VERSION(3,22,0) | ||
86 | gtk_menu_popup_at_widget(GTK_MENU(menu),label,GDK_GRAVITY_SOUTH_WEST,GDK_GRAVITY_NORTH_WEST,(GdkEvent *) event); | 88 | gtk_menu_popup_at_widget(GTK_MENU(menu),label,GDK_GRAVITY_SOUTH_WEST,GDK_GRAVITY_NORTH_WEST,(GdkEvent *) event); |
89 | +#else | ||
90 | + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, 0); | ||
91 | +#endif | ||
87 | 92 | ||
88 | return TRUE; | 93 | return TRUE; |
89 | } | 94 | } |
@@ -315,7 +320,7 @@ | @@ -315,7 +320,7 @@ | ||
315 | #if GTK_CHECK_VERSION(3,22,0) | 320 | #if GTK_CHECK_VERSION(3,22,0) |
316 | gtk_menu_popup_at_pointer(GTK_MENU(popup), event); | 321 | gtk_menu_popup_at_pointer(GTK_MENU(popup), event); |
317 | #else | 322 | #else |
318 | - gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, event->button, event->time); | 323 | + gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, 0, 0); |
319 | #endif | 324 | #endif |
320 | 325 | ||
321 | return TRUE; | 326 | return TRUE; |
@@ -337,7 +342,7 @@ | @@ -337,7 +342,7 @@ | ||
337 | #if GTK_CHECK_VERSION(3,22,0) | 342 | #if GTK_CHECK_VERSION(3,22,0) |
338 | gtk_menu_popup_at_pointer(GTK_MENU(popup), event); | 343 | gtk_menu_popup_at_pointer(GTK_MENU(popup), event); |
339 | #else | 344 | #else |
340 | - gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, event->button, event->time); | 345 | + gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, 0, 0); |
341 | #endif | 346 | #endif |
342 | 347 | ||
343 | return TRUE; | 348 | return TRUE; |