Build with GTK_DISABLE_DEPRECATED

This commit is contained in:
TingPing 2014-02-08 09:53:56 -05:00
parent 725aed43ff
commit f35ae03a66
3 changed files with 4 additions and 7 deletions

View File

@ -206,7 +206,7 @@ if test "$gtkfe" = yes ; then
fi fi
GUI_LIBS="$GUI_LIBS $GTK_LIBS" GUI_LIBS="$GUI_LIBS $GTK_LIBS"
GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED"
dnl ********************************************************************* dnl *********************************************************************
dnl ** MAC_INTEGRATION ************************************************** dnl ** MAC_INTEGRATION **************************************************

View File

@ -491,10 +491,6 @@ gtkutil_button (GtkWidget *box, char *stock, char *tip, void *callback,
gtk_widget_show (bbox); gtk_widget_show (bbox);
img = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); img = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU);
if (strcmp (stock, GTK_STOCK_GOTO_LAST) == 0)
{
gtk_widget_set_usize (img, 10, 6);
}
gtk_container_add (GTK_CONTAINER (bbox), img); gtk_container_add (GTK_CONTAINER (bbox), img);
gtk_widget_show (img); gtk_widget_show (img);
gtk_box_pack_start (GTK_BOX (box), wid, 0, 0, 0); gtk_box_pack_start (GTK_BOX (box), wid, 0, 0, 0);
@ -521,7 +517,8 @@ GtkWidget *
gtkutil_entry_new (int max, GtkWidget * box, void *callback, gtkutil_entry_new (int max, GtkWidget * box, void *callback,
gpointer userdata) gpointer userdata)
{ {
GtkWidget *entry = gtk_entry_new_with_max_length (max); GtkWidget *entry = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (entry), max);
gtk_container_add (GTK_CONTAINER (box), entry); gtk_container_add (GTK_CONTAINER (box), entry);
if (callback) if (callback)
g_signal_connect (G_OBJECT (entry), "changed", g_signal_connect (G_OBJECT (entry), "changed",

View File

@ -17,7 +17,7 @@
<!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* --> <!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->
<!-- must be buildable with GSEAL_ENABLE in the future, xtext, setup, and chanview-tabs stand in the way --> <!-- must be buildable with GSEAL_ENABLE in the future, xtext, setup, and chanview-tabs stand in the way -->
<OwnFlags>GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline</OwnFlags> <OwnFlags>GTK_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline</OwnFlags>
<DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot> <DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot>
<GendefPath>$(YourGendefPath)</GendefPath> <GendefPath>$(YourGendefPath)</GendefPath>
<MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath> <MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>