Mercurial > vim
comparison src/gui_beval.c @ 10176:51888fb2599f v7.4.2358
commit https://github.com/vim/vim/commit/d47d83745ff450232328ca7a4b8b00b31bad22fc
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 9 22:13:24 2016 +0200
patch 7.4.2358
Problem: Compiler warnings with Solaris Studio when using GTK3.
Solution: Define FUNC2GENERIC depending on the system. (Kazunobu Kuriyama)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 09 Sep 2016 22:45:07 +0200 |
parents | 4aead6a9b7a9 |
children | 66f1b5bf3fa6 |
comparison
equal
deleted
inserted
replaced
10175:7172d313819c | 10176:51888fb2599f |
---|---|
506 removeEventHandler(BalloonEval *beval) | 506 removeEventHandler(BalloonEval *beval) |
507 { | 507 { |
508 /* LINTED: avoid warning: dubious operation on enum */ | 508 /* LINTED: avoid warning: dubious operation on enum */ |
509 # if GTK_CHECK_VERSION(3,0,0) | 509 # if GTK_CHECK_VERSION(3,0,0) |
510 g_signal_handlers_disconnect_by_func(G_OBJECT(beval->target), | 510 g_signal_handlers_disconnect_by_func(G_OBJECT(beval->target), |
511 G_CALLBACK(target_event_cb), | 511 FUNC2GENERIC(target_event_cb), |
512 beval); | 512 beval); |
513 # else | 513 # else |
514 gtk_signal_disconnect_by_func((GtkObject*)(beval->target), | 514 gtk_signal_disconnect_by_func((GtkObject*)(beval->target), |
515 GTK_SIGNAL_FUNC(target_event_cb), | 515 GTK_SIGNAL_FUNC(target_event_cb), |
516 beval); | 516 beval); |
520 && gtk_widget_is_ancestor(beval->target, gui.mainwin)) | 520 && gtk_widget_is_ancestor(beval->target, gui.mainwin)) |
521 { | 521 { |
522 /* LINTED: avoid warning: dubious operation on enum */ | 522 /* LINTED: avoid warning: dubious operation on enum */ |
523 # if GTK_CHECK_VERSION(3,0,0) | 523 # if GTK_CHECK_VERSION(3,0,0) |
524 g_signal_handlers_disconnect_by_func(G_OBJECT(gui.mainwin), | 524 g_signal_handlers_disconnect_by_func(G_OBJECT(gui.mainwin), |
525 G_CALLBACK(mainwin_event_cb), | 525 FUNC2GENERIC(mainwin_event_cb), |
526 beval); | 526 beval); |
527 # else | 527 # else |
528 gtk_signal_disconnect_by_func((GtkObject*)(gui.mainwin), | 528 gtk_signal_disconnect_by_func((GtkObject*)(gui.mainwin), |
529 GTK_SIGNAL_FUNC(mainwin_event_cb), | 529 GTK_SIGNAL_FUNC(mainwin_event_cb), |
530 beval); | 530 beval); |