Mercurial > vim
diff src/gui_gtk.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 | ef7f63b97855 |
| children | 1abd0fc18bcd |
line wrap: on
line diff
--- a/src/gui_gtk.c +++ b/src/gui_gtk.c @@ -810,7 +810,7 @@ gui_mch_add_menu_item(vimmenu_T *menu, i void gui_mch_set_text_area_pos(int x, int y, int w, int h) { - gtk_form_move_resize(GTK_FORM(gui.formwin), gui.drawarea, x, y, w, h); + gui_gtk_form_move_resize(GTK_FORM(gui.formwin), gui.drawarea, x, y, w, h); } @@ -1005,7 +1005,7 @@ gui_mch_set_scrollbar_thumb(scrollbar_T gui_mch_set_scrollbar_pos(scrollbar_T *sb, int x, int y, int w, int h) { if (sb->id != NULL) - gtk_form_move_resize(GTK_FORM(gui.formwin), sb->id, x, y, w, h); + gui_gtk_form_move_resize(GTK_FORM(gui.formwin), sb->id, x, y, w, h); } int @@ -1111,7 +1111,7 @@ gui_mch_create_scrollbar(scrollbar_T *sb GtkAdjustment *adjustment; gtk_widget_set_can_focus(sb->id, FALSE); - gtk_form_put(GTK_FORM(gui.formwin), sb->id, 0, 0); + gui_gtk_form_put(GTK_FORM(gui.formwin), sb->id, 0, 0); adjustment = gtk_range_get_adjustment(GTK_RANGE(sb->id));