Mercurial > vim

comparison src/gui_gtk_f.c @ 10176:51888fb2599f v7.4.2358

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cd8dbed175a1
comparison
equal deleted inserted replaced
10175:7172d313819c 10176:51888fb2599f
503 503
504 if (child->window != NULL) 504 if (child->window != NULL)
505 { 505 {
506 #if GTK_CHECK_VERSION(3,0,0) 506 #if GTK_CHECK_VERSION(3,0,0)
507 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), 507 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
508 G_CALLBACK(gtk_form_child_map), 508 FUNC2GENERIC(gtk_form_child_map),
509 child); 509 child);
510 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), 510 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
511 G_CALLBACK(gtk_form_child_unmap), 511 FUNC2GENERIC(gtk_form_child_unmap),
512 child); 512 child);
513 #else 513 #else
514 gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget), 514 gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget),
515 GTK_SIGNAL_FUNC(gtk_form_child_map), 515 GTK_SIGNAL_FUNC(gtk_form_child_map),
516 child); 516 child);
517 gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget), 517 gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget),
518 GTK_SIGNAL_FUNC(gtk_form_child_unmap), 518 GTK_SIGNAL_FUNC(gtk_form_child_unmap),
519 child); 519 child);
520 #endif 520 #endif
521 521
522 gdk_window_set_user_data(child->window, NULL); 522 gdk_window_set_user_data(child->window, NULL);
523 gdk_window_destroy(child->window); 523 gdk_window_destroy(child->window);
524 524
791 #endif 791 #endif
792 if (child->window) 792 if (child->window)
793 { 793 {
794 #if GTK_CHECK_VERSION(3,0,0) 794 #if GTK_CHECK_VERSION(3,0,0)
795 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), 795 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
796 G_CALLBACK(&gtk_form_child_map), child); 796 FUNC2GENERIC(&gtk_form_child_map), child);
797 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), 797 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
798 G_CALLBACK(&gtk_form_child_unmap), child); 798 FUNC2GENERIC(&gtk_form_child_unmap), child);
799 #else 799 #else
800 gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget), 800 gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget),
801 GTK_SIGNAL_FUNC(&gtk_form_child_map), child); 801 GTK_SIGNAL_FUNC(&gtk_form_child_map), child);
802 gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget), 802 gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget),
803 GTK_SIGNAL_FUNC(&gtk_form_child_unmap), child); 803 GTK_SIGNAL_FUNC(&gtk_form_child_unmap), child);
804 #endif 804 #endif
805 805
806 /* FIXME: This will cause problems for reparenting NO_WINDOW 806 /* FIXME: This will cause problems for reparenting NO_WINDOW
807 * widgets out of a GtkForm 807 * widgets out of a GtkForm
808 */ 808 */