Mercurial > vim
diff src/feature.h @ 2277:f42e0b5ff9e9 vim73
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sat, 26 Jun 2010 05:38:18 +0200 |
| parents | 646d34788036 |
| children | 966a5609669e |
line wrap: on
line diff
--- a/src/feature.h +++ b/src/feature.h @@ -640,7 +640,7 @@ * Disabled for EBCDIC: * Multibyte support doesn't work on z/OS Unix currently. */ -#if (defined(FEAT_BIG) || defined(HAVE_GTK2) || defined(FEAT_ARABIC)) \ +#if (defined(FEAT_BIG) || defined(FEAT_GUI_GTK) || defined(FEAT_ARABIC)) \ && !defined(FEAT_MBYTE) && !defined(WIN16) \ && SIZEOF_INT >= 4 && !defined(EBCDIC) # define FEAT_MBYTE @@ -693,7 +693,7 @@ # define ESC_CHG_TO_ENG_MODE /* if defined, when ESC pressed, * turn to english mode */ -# if !defined(FEAT_XFONTSET) && defined(HAVE_X11) && !defined(HAVE_GTK2) +# if !defined(FEAT_XFONTSET) && defined(HAVE_X11) && !defined(FEAT_GUI_GTK) # define FEAT_XFONTSET /* Hangul input requires xfontset */ # endif # if defined(FEAT_XIM) && !defined(LINT) @@ -710,7 +710,7 @@ * +xfontset X fontset support. For outputting wide characters. */ #ifndef FEAT_XFONTSET -# if defined(FEAT_MBYTE) && defined(HAVE_X11) && !defined(HAVE_GTK2) +# if defined(FEAT_MBYTE) && defined(HAVE_X11) && !defined(FEAT_GUI_GTK) # define FEAT_XFONTSET # else /* # define FEAT_XFONTSET */