To: vim-dev@vim.org

To: [email protected]
Subject: Patch 7.2a.012
Fcc: outbox
From: Bram Moolenaar <[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2a.012
Problem: Compiler warnings for casting int to pointer.
Solution: Add cast to long in between. (Martin Toft)
Files: src/gui_gtk_x11.c

*** ../vim-7.2a.011/src/gui_gtk_x11.c Wed Jun 25 00:38:19 2008
--- src/gui_gtk_x11.c Tue Jul 1 20:18:58 2008
***************
*** 3166,3172 ****
gtk_container_add(GTK_CONTAINER(menu), item);
gtk_signal_connect(GTK_OBJECT(item), "activate",
GTK_SIGNAL_FUNC(tabline_menu_handler),
! (gpointer)resp);
}

/*
--- 3166,3172 ----
gtk_container_add(GTK_CONTAINER(menu), item);
gtk_signal_connect(GTK_OBJECT(item), "activate",
GTK_SIGNAL_FUNC(tabline_menu_handler),
! (gpointer)(long)resp);
}

/*
***************
*** 3354,3360 ****
}

event_box = gtk_notebook_get_tab_label(GTK_NOTEBOOK(gui.tabline), page);
! gtk_object_set_user_data(GTK_OBJECT(event_box), (gpointer)tab_num);
label = GTK_BIN(event_box)->child;
get_tabline_label(tp, FALSE);
labeltext = CONVERT_TO_UTF8(NameBuff);
--- 3354,3361 ----
}

event_box = gtk_notebook_get_tab_label(GTK_NOTEBOOK(gui.tabline), page);
! 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,3717 ****
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_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);
--- 3712,3718 ----
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)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);
*** ../vim-7.2a.011/src/version.c Tue Jul 1 21:55:58 2008
--- src/version.c Wed Jul 2 21:03:32 2008
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 12,
/**/

--
hundred-and-one symptoms of being an internet addict:
141. You'd rather go to http://www.weather.com/ than look out your window.

/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///