commit d47d83745ff450232328ca7a4b8b00b31bad22fc
author Bram Moolenaar <Bram@vim.org> Fri Sep 09 22:13:24 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Sep 09 22:13:24 2016 +0200
tree d31c75ba0d362c58fcdfee797661b63b9c8f9fd0
parent 46643713dc6bb04b4e84986b1763ef309e960161

patch 7.4.2358
Problem:    Compiler warnings with Solaris Studio when using GTK3.
Solution:   Define FUNC2GENERIC depending on the system. (Kazunobu Kuriyama)

src/gui_gtk_f.c

diff --git a/src/gui_gtk_f.c b/src/gui_gtk_f.c
index 931a939..182fe82 100644
--- a/src/gui_gtk_f.c
+++ b/src/gui_gtk_f.c
@@ -505,18 +505,18 @@
 	{
 #if GTK_CHECK_VERSION(3,0,0)
 	    g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
-		    G_CALLBACK(gtk_form_child_map),
+		    FUNC2GENERIC(gtk_form_child_map),
 		    child);
 	    g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
-		    G_CALLBACK(gtk_form_child_unmap),
+		    FUNC2GENERIC(gtk_form_child_unmap),
 		    child);
 #else
 	    gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget),
-					  GTK_SIGNAL_FUNC(gtk_form_child_map),
-					  child);
+		    GTK_SIGNAL_FUNC(gtk_form_child_map),
+		    child);
 	    gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget),
-					  GTK_SIGNAL_FUNC(gtk_form_child_unmap),
-					  child);
+		    GTK_SIGNAL_FUNC(gtk_form_child_unmap),
+		    child);
 #endif
 
 	    gdk_window_set_user_data(child->window, NULL);
@@ -793,14 +793,14 @@
 	{
 #if GTK_CHECK_VERSION(3,0,0)
 	    g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
-					  G_CALLBACK(&gtk_form_child_map), child);
+		    FUNC2GENERIC(&gtk_form_child_map), child);
 	    g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
-					  G_CALLBACK(&gtk_form_child_unmap), child);
+		    FUNC2GENERIC(&gtk_form_child_unmap), child);
 #else
 	    gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget),
-					  GTK_SIGNAL_FUNC(&gtk_form_child_map), child);
+		    GTK_SIGNAL_FUNC(&gtk_form_child_map), child);
 	    gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget),
-					  GTK_SIGNAL_FUNC(&gtk_form_child_unmap), child);
+		    GTK_SIGNAL_FUNC(&gtk_form_child_unmap), child);
 #endif
 
 	    /* FIXME: This will cause problems for reparenting NO_WINDOW