Mercurial > vim
diff src/gui_gtk_x11.c @ 22659:8623ab39b421 v8.2.1878
patch 8.2.1878: GTK: error for redefining function
Commit: https://github.com/vim/vim/commit/8a99e66b4f7616d9b0b9cefe742f82f9122087d5
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Oct 21 16:10:21 2020 +0200
patch 8.2.1878: GTK: error for redefining function
Problem: GTK: error for redefining function. (Tony Mechelynck)
Solution: Remove "gtk_" prefix from local functions and prepend "gui_" to
global functions.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 21 Oct 2020 16:15:04 +0200 |
| parents | 6c7e4db139a3 |
| children | e82579016863 |
line wrap: on
line diff
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3811,7 +3811,7 @@ gui_mch_init(void) G_CALLBACK(on_tabline_menu), G_OBJECT(tabline_menu)); #endif // FEAT_GUI_TABLINE - gui.formwin = gtk_form_new(); + gui.formwin = gui_gtk_form_new(); gtk_container_set_border_width(GTK_CONTAINER(gui.formwin), 0); #if !GTK_CHECK_VERSION(3,0,0) gtk_widget_set_events(gui.formwin, GDK_EXPOSURE_MASK); @@ -3840,7 +3840,7 @@ gui_mch_init(void) GDK_POINTER_MOTION_HINT_MASK); gtk_widget_show(gui.drawarea); - gtk_form_put(GTK_FORM(gui.formwin), gui.drawarea, 0, 0); + gui_gtk_form_put(GTK_FORM(gui.formwin), gui.drawarea, 0, 0); gtk_widget_show(gui.formwin); gtk_box_pack_start(GTK_BOX(vbox), gui.formwin, TRUE, TRUE, 0); @@ -4119,9 +4119,9 @@ form_configure_event(GtkWidget *widget U if (gtk_socket_id != 0) usable_height -= (gui.char_height - (gui.char_height/2)); // sic. - gtk_form_freeze(GTK_FORM(gui.formwin)); + gui_gtk_form_freeze(GTK_FORM(gui.formwin)); gui_resize_shell(event->width, usable_height); - gtk_form_thaw(GTK_FORM(gui.formwin)); + gui_gtk_form_thaw(GTK_FORM(gui.formwin)); return TRUE; }