diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-07-02 19:05:48 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-07-02 19:05:48 +0000 |
| commit | 47b46d7c470dab0823e03ec671b2bde543456c73 (patch) | |
| tree | e0a32c23706d502f6771b67deb604a47a01e90fc | |
| parent | e30de2d1dc40ede717b744926daf3b60dc64e22d (diff) | |
| download | vim-git-47b46d7c470dab0823e03ec671b2bde543456c73.tar.gz | |
updated for version 7.2a-012v7.2a.012
| -rw-r--r-- | src/gui_gtk_x11.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index d01a831b5..741b733d7 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3166,7 +3166,7 @@ add_tabline_menu_item(GtkWidget *menu, char_u *text, int resp) gtk_container_add(GTK_CONTAINER(menu), item); gtk_signal_connect(GTK_OBJECT(item), "activate", GTK_SIGNAL_FUNC(tabline_menu_handler), - (gpointer)resp); + (gpointer)(long)resp); } /* @@ -3354,7 +3354,8 @@ gui_mch_update_tabline(void) } event_box = gtk_notebook_get_tab_label(GTK_NOTEBOOK(gui.tabline), page); - gtk_object_set_user_data(GTK_OBJECT(event_box), (gpointer)tab_num); + gtk_object_set_user_data(GTK_OBJECT(event_box), + (gpointer)(long)tab_num); label = GTK_BIN(event_box)->child; get_tabline_label(tp, FALSE); labeltext = CONVERT_TO_UTF8(NameBuff); @@ -3711,7 +3712,7 @@ gui_mch_init(void) gtk_widget_show(label); event_box = gtk_event_box_new(); gtk_widget_show(event_box); - gtk_object_set_user_data(GTK_OBJECT(event_box), (gpointer)1); + gtk_object_set_user_data(GTK_OBJECT(event_box), (gpointer)1L); gtk_misc_set_padding(GTK_MISC(label), 2, 2); gtk_container_add(GTK_CONTAINER(event_box), label); gtk_notebook_set_tab_label(GTK_NOTEBOOK(gui.tabline), page, event_box); diff --git a/src/version.c b/src/version.c index cd69cfc02..f46ebda2c 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 12, +/**/ 11, /**/ 10, |