Skip to content

Commit 3f2a5d8

Browse files
committed
patch 7.4.1443
Problem: Can't build GTK3 with small features. Solution: Use gtk_widget_get_window(). Fix typos. (Dominique Pelle)
1 parent e0fd2aa commit 3f2a5d8

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/gui_gtk_x11.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,7 @@ selection_get_cb(GtkWidget *widget UNUSED,
15431543
length += 2;
15441544

15451545
#if !GTK_CHECK_VERSION(3,0,0)
1546-
/* Looks redandunt even for GTK2 because these values are
1546+
/* Looks redundant even for GTK2 because these values are
15471547
* overwritten by gtk_selection_data_set() that follows. */
15481548
selection_data->type = selection_data->target;
15491549
selection_data->format = 16; /* 16 bits per char */
@@ -1597,7 +1597,7 @@ selection_get_cb(GtkWidget *widget UNUSED,
15971597
if (string != NULL)
15981598
{
15991599
#if !GTK_CHECK_VERSION(3,0,0)
1600-
/* Looks redandunt even for GTK2 because these values are
1600+
/* Looks redundant even for GTK2 because these values are
16011601
* overwritten by gtk_selection_data_set() that follows. */
16021602
selection_data->type = selection_data->target;
16031603
selection_data->format = 8; /* 8 bits per char */
@@ -3921,7 +3921,7 @@ gui_mch_init(void)
39213921
*/
39223922
/* some aesthetics on the toolbar */
39233923
# ifdef USE_GTK3
3924-
/* TODO: Add GTK+ 3 code here using GtkCssProvider if neccessary. */
3924+
/* TODO: Add GTK+ 3 code here using GtkCssProvider if necessary. */
39253925
/* N.B. Since the default value of GtkToolbar::button-relief is
39263926
* GTK_RELIEF_NONE, there's no need to specify that, probably. */
39273927
# else
@@ -4447,8 +4447,8 @@ mainwin_destroy_cb(GtkObject *object UNUSED, gpointer data UNUSED)
44474447
* plug's window 'min hints to set *it's* minimum size, but that's also the
44484448
* only way we have of making ourselves bigger (by set lines/columns).
44494449
* Thus set hints at start-up to ensure correct init. size, then a
4450-
* second after the final attempt to reset the real minimum hinst (done by
4451-
* scrollbar init.), actually do the standard hinst and stop the timer.
4450+
* second after the final attempt to reset the real minimum hints (done by
4451+
* scrollbar init.), actually do the standard hints and stop the timer.
44524452
* We'll not let the default hints be set while this timer's active.
44534453
*/
44544454
static gboolean
@@ -7078,6 +7078,8 @@ gui_mch_mousehide(int hide)
70787078
else
70797079
#ifdef FEAT_MOUSESHAPE
70807080
mch_set_mouse_shape(last_shape);
7081+
#elif GTK_CHECK_VERSION(3,0,0)
7082+
gdk_window_set_cursor(gtk_widget_get_window(gui.drawarea), NULL);
70817083
#else
70827084
gdk_window_set_cursor(gui.drawarea->window, NULL);
70837085
#endif

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,8 @@ static char *(features[]) =
743743

744744
static int included_patches[] =
745745
{ /* Add new patch number below this line */
746+
/**/
747+
1443,
746748
/**/
747749
1442,
748750
/**/

0 commit comments

Comments
 (0)