Mercurial > vim
changeset 8301:6a4c11fa1aa3 v7.4.1443
commit https://github.com/vim/vim/commit/3f2a5d8dfbe2998b4d3d369c0275e2366c92666b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 27 22:08:16 2016 +0100
patch 7.4.1443
Problem: Can't build GTK3 with small features.
Solution: Use gtk_widget_get_window(). Fix typos. (Dominique Pelle)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 27 Feb 2016 22:15:04 +0100 |
| parents | df7b59e594c4 |
| children | f88943c348e9 |
| files | src/gui_gtk_x11.c src/version.c |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -1543,7 +1543,7 @@ selection_get_cb(GtkWidget *widget U length += 2; #if !GTK_CHECK_VERSION(3,0,0) - /* Looks redandunt even for GTK2 because these values are + /* Looks redundant even for GTK2 because these values are * overwritten by gtk_selection_data_set() that follows. */ selection_data->type = selection_data->target; selection_data->format = 16; /* 16 bits per char */ @@ -1597,7 +1597,7 @@ selection_get_cb(GtkWidget *widget U if (string != NULL) { #if !GTK_CHECK_VERSION(3,0,0) - /* Looks redandunt even for GTK2 because these values are + /* Looks redundant even for GTK2 because these values are * overwritten by gtk_selection_data_set() that follows. */ selection_data->type = selection_data->target; selection_data->format = 8; /* 8 bits per char */ @@ -3921,7 +3921,7 @@ gui_mch_init(void) */ /* some aesthetics on the toolbar */ # ifdef USE_GTK3 - /* TODO: Add GTK+ 3 code here using GtkCssProvider if neccessary. */ + /* TODO: Add GTK+ 3 code here using GtkCssProvider if necessary. */ /* N.B. Since the default value of GtkToolbar::button-relief is * GTK_RELIEF_NONE, there's no need to specify that, probably. */ # else @@ -4447,8 +4447,8 @@ mainwin_destroy_cb(GtkObject *object UNU * plug's window 'min hints to set *it's* minimum size, but that's also the * only way we have of making ourselves bigger (by set lines/columns). * Thus set hints at start-up to ensure correct init. size, then a - * second after the final attempt to reset the real minimum hinst (done by - * scrollbar init.), actually do the standard hinst and stop the timer. + * second after the final attempt to reset the real minimum hints (done by + * scrollbar init.), actually do the standard hints and stop the timer. * We'll not let the default hints be set while this timer's active. */ static gboolean @@ -7078,6 +7078,8 @@ gui_mch_mousehide(int hide) else #ifdef FEAT_MOUSESHAPE mch_set_mouse_shape(last_shape); +#elif GTK_CHECK_VERSION(3,0,0) + gdk_window_set_cursor(gtk_widget_get_window(gui.drawarea), NULL); #else gdk_window_set_cursor(gui.drawarea->window, NULL); #endif