summaryrefslogtreecommitdiff
path: root/src/gui_gtk.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-10-21 16:10:21 +0200
committerBram Moolenaar <Bram@vim.org>2020-10-21 16:10:21 +0200
commit8a99e66b4f7616d9b0b9cefe742f82f9122087d5 (patch)
treec392281e9d218fc7de5ea84743d918169287933a /src/gui_gtk.c
parentb8f519e5382f9876ae7f8bc64d9814d07a8ef972 (diff)
downloadvim-git-8a99e66b4f7616d9b0b9cefe742f82f9122087d5.tar.gz
patch 8.2.1878: GTK: error for redefining functionv8.2.1878
Problem: GTK: error for redefining function. (Tony Mechelynck) Solution: Remove "gtk_" prefix from local functions and prepend "gui_" to global functions.
Diffstat (limited to 'src/gui_gtk.c')
-rw-r--r--src/gui_gtk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 173304868..48910b287 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -810,7 +810,7 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx)
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 *sb, long val, long size, long max)
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, int orient)
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));