Mercurial > vim
diff src/option.c @ 2275:e4d849f4df03 vim73
Remove the old and not well supported GTK 1 code. (James Vega)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 25 Jun 2010 05:37:59 +0200 |
| parents | 2b33a7678e7b |
| children | ccda151dde4e |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -2582,7 +2582,7 @@ static struct vimoption {(char_u *)"icons,tooltips", (char_u *)0L} SCRIPTID_INIT}, #endif -#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) && defined(HAVE_GTK2) +#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) {"toolbariconsize", "tbis", P_STRING|P_VI_DEF, (char_u *)&p_tbis, PV_NONE, {(char_u *)"small", (char_u *)0L} SCRIPTID_INIT}, @@ -5152,7 +5152,7 @@ didset_options() #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) (void)opt_strings_flags(p_toolbar, p_toolbar_values, &toolbar_flags, TRUE); #endif -#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) && defined(HAVE_GTK2) +#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) (void)opt_strings_flags(p_tbis, p_tbis_values, &tbis_flags, FALSE); #endif #ifdef FEAT_CMDWIN @@ -5825,7 +5825,7 @@ did_set_string_option(opt_idx, varp, new } } -# if defined(FEAT_GUI_GTK) && defined(HAVE_GTK2) +# if defined(FEAT_GUI_GTK) if (errmsg == NULL && varp == &p_tenc && gui.in_use) { /* GTK+ 2 uses only a single encoding, and that is UTF-8. */ @@ -6602,7 +6602,7 @@ did_set_string_option(opt_idx, varp, new } #endif -#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) && defined(HAVE_GTK2) +#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) /* 'toolbariconsize': GTK+ 2 only */ else if (varp == &p_tbis) {