Hi
vim-7.4.1433 compiles fine on xubuntu-15.10 with:
$ ./configure --with-features=normal --enable-gui=gtk3
But compilation fails with:
$ ./configure --with-features=small --enable-gui=gtk3
$ make
...
gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_GTK -pthread
-I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0
-I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0
-I/usr/lib/i386-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0
-I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient
-I/usr/include/mircommon -I/usr/include/cairo -I/usr/include/pango-1.0
-I/usr/include/harfbuzz -I/usr/include/pango-1.0
-I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1
-I/usr/include/freetype2 -I/usr/include/libpng12
-I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12
-I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include
-g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -o
objects/gui_gtk_x11.o gui_gtk_x11.c
gui_gtk_x11.c: In function ‘gui_mch_mousehide’:
gui_gtk_x11.c:7082:37: error: ‘GtkWidget {aka struct _GtkWidget}’ has
no member named ‘window’
gdk_window_set_cursor(gui.drawarea->window, NULL);
^
Attached patch fixes it, along with a couple of typos in comments.
Regards
Dominique
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 69e4e18..cd8cc60 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -1543,7 +1543,7 @@ selection_get_cb(GtkWidget *widget UNUSED,
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 UNUSED,
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 UNUSED, gpointer data UNUSED)
* 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
