Mercurial > vim

comparison src/gui_gtk.c @ 22659:8623ab39b421 v8.2.1878

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
22658:05d69fc68432 22659:8623ab39b421
808 808
809 809
810 void 810 void
811 gui_mch_set_text_area_pos(int x, int y, int w, int h) 811 gui_mch_set_text_area_pos(int x, int y, int w, int h)
812 { 812 {
813 gtk_form_move_resize(GTK_FORM(gui.formwin), gui.drawarea, x, y, w, h); 813 gui_gtk_form_move_resize(GTK_FORM(gui.formwin), gui.drawarea, x, y, w, h);
814 } 814 }
815 815
816 816
817 #if defined(FEAT_MENU) || defined(PROTO) 817 #if defined(FEAT_MENU) || defined(PROTO)
818 /* 818 /*
1003 1003
1004 void 1004 void
1005 gui_mch_set_scrollbar_pos(scrollbar_T *sb, int x, int y, int w, int h) 1005 gui_mch_set_scrollbar_pos(scrollbar_T *sb, int x, int y, int w, int h)
1006 { 1006 {
1007 if (sb->id != NULL) 1007 if (sb->id != NULL)
1008 gtk_form_move_resize(GTK_FORM(gui.formwin), sb->id, x, y, w, h); 1008 gui_gtk_form_move_resize(GTK_FORM(gui.formwin), sb->id, x, y, w, h);
1009 } 1009 }
1010 1010
1011 int 1011 int
1012 gui_mch_get_scrollbar_xpadding(void) 1012 gui_mch_get_scrollbar_xpadding(void)
1013 { 1013 {
1109 if (sb->id != NULL) 1109 if (sb->id != NULL)
1110 { 1110 {
1111 GtkAdjustment *adjustment; 1111 GtkAdjustment *adjustment;
1112 1112
1113 gtk_widget_set_can_focus(sb->id, FALSE); 1113 gtk_widget_set_can_focus(sb->id, FALSE);
1114 gtk_form_put(GTK_FORM(gui.formwin), sb->id, 0, 0); 1114 gui_gtk_form_put(GTK_FORM(gui.formwin), sb->id, 0, 0);
1115 1115
1116 adjustment = gtk_range_get_adjustment(GTK_RANGE(sb->id)); 1116 adjustment = gtk_range_get_adjustment(GTK_RANGE(sb->id));
1117 1117
1118 sb->handler_id = g_signal_connect( 1118 sb->handler_id = g_signal_connect(
1119 G_OBJECT(adjustment), "value-changed", 1119 G_OBJECT(adjustment), "value-changed",