diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-09 22:13:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-09 22:13:24 +0200 |
| commit | d47d83745ff450232328ca7a4b8b00b31bad22fc (patch) | |
| tree | d31c75ba0d362c58fcdfee797661b63b9c8f9fd0 /src/gui_gtk_f.c | |
| parent | 46643713dc6bb04b4e84986b1763ef309e960161 (diff) | |
| download | vim-git-d47d83745ff450232328ca7a4b8b00b31bad22fc.tar.gz | |
patch 7.4.2358v7.4.2358
Problem: Compiler warnings with Solaris Studio when using GTK3.
Solution: Define FUNC2GENERIC depending on the system. (Kazunobu Kuriyama)
Diffstat (limited to 'src/gui_gtk_f.c')
| -rw-r--r-- | src/gui_gtk_f.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui_gtk_f.c b/src/gui_gtk_f.c index 931a9395a..182fe82f9 100644 --- a/src/gui_gtk_f.c +++ b/src/gui_gtk_f.c @@ -505,18 +505,18 @@ gtk_form_unrealize(GtkWidget *widget) { #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 @@ gtk_form_remove(GtkContainer *container, GtkWidget *widget) { #if GTK_CHECK_VERSION(3,0,0) g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), - G_CALLBACK(>k_form_child_map), child); + FUNC2GENERIC(>k_form_child_map), child); g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), - G_CALLBACK(>k_form_child_unmap), child); + FUNC2GENERIC(>k_form_child_unmap), child); #else gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget), - GTK_SIGNAL_FUNC(>k_form_child_map), child); + GTK_SIGNAL_FUNC(>k_form_child_map), child); gtk_signal_disconnect_by_func(GTK_OBJECT(child->widget), - GTK_SIGNAL_FUNC(>k_form_child_unmap), child); + GTK_SIGNAL_FUNC(>k_form_child_unmap), child); #endif /* FIXME: This will cause problems for reparenting NO_WINDOW |