comparison src/feature.h @ 21745:35921b7fc07a v8.2.1422

patch 8.2.1422: the Mac GUI implementation is outdated Commit: https://github.com/vim/vim/commit/097148e849136b49052b1b5123c714fb1d74db9b Author: Bram Moolenaar <Bram@vim.org> Date: Tue Aug 11 21:58:20 2020 +0200 patch 8.2.1422: the Mac GUI implementation is outdated Problem: The Mac GUI implementation is outdated and probably doesn't even work. Solution: Remove the Mac GUI code. The MacVim project provides the supported Vim GUI version.
author Bram Moolenaar <Bram@vim.org>
date Tue, 11 Aug 2020 22:00:04 +0200
parents 22f0dda71638
children e5de71dd168b
comparison
equal deleted inserted replaced
21744:805e8d18b78b 21745:35921b7fc07a
630 * GUI tabline 630 * GUI tabline
631 */ 631 */
632 #if defined(FEAT_NORMAL) \ 632 #if defined(FEAT_NORMAL) \
633 && (defined(FEAT_GUI_GTK) \ 633 && (defined(FEAT_GUI_GTK) \
634 || (defined(FEAT_GUI_MOTIF) && defined(HAVE_XM_NOTEBOOK_H)) \ 634 || (defined(FEAT_GUI_MOTIF) && defined(HAVE_XM_NOTEBOOK_H)) \
635 || defined(FEAT_GUI_MAC) \
636 || defined(FEAT_GUI_HAIKU) \ 635 || defined(FEAT_GUI_HAIKU) \
637 || (defined(FEAT_GUI_MSWIN) \ 636 || (defined(FEAT_GUI_MSWIN) \
638 && (!defined(_MSC_VER) || _MSC_VER > 1020))) 637 && (!defined(_MSC_VER) || _MSC_VER > 1020)))
639 # define FEAT_GUI_TABLINE 638 # define FEAT_GUI_TABLINE
640 #endif 639 #endif
644 * or just the ":browse" command modifier 643 * or just the ":browse" command modifier
645 */ 644 */
646 #if defined(FEAT_NORMAL) 645 #if defined(FEAT_NORMAL)
647 # define FEAT_BROWSE_CMD 646 # define FEAT_BROWSE_CMD
648 # if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ 647 # if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \
649 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_HAIKU) || defined(FEAT_GUI_PHOTON) \ 648 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_HAIKU) || defined(FEAT_GUI_PHOTON)
650 || defined(FEAT_GUI_MAC)
651 # define FEAT_BROWSE 649 # define FEAT_BROWSE
652 # endif 650 # endif
653 #endif 651 #endif
654 652
655 /* 653 /*
656 * On some systems, when we compile with the GUI, we always use it. On Mac 654 * On some systems, when we compile with the GUI, we always use it. On Mac
657 * there is no terminal version, and on Windows we can't figure out how to 655 * there is no terminal version, and on Windows we can't figure out how to
658 * fork one off with :gui. 656 * fork one off with :gui.
659 */ 657 */
660 #if (defined(FEAT_GUI_MSWIN) && !defined(VIMDLL)) \ 658 #if defined(FEAT_GUI_MSWIN) && !defined(VIMDLL)
661 || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_DARWIN))
662 # define ALWAYS_USE_GUI 659 # define ALWAYS_USE_GUI
663 #endif 660 #endif
664 661
665 /* 662 /*
666 * +dialog_gui Use GUI dialog. 663 * +dialog_gui Use GUI dialog.
671 # if ((defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MOTIF)) \ 668 # if ((defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MOTIF)) \
672 && defined(HAVE_X11_XPM_H)) \ 669 && defined(HAVE_X11_XPM_H)) \
673 || defined(FEAT_GUI_GTK) \ 670 || defined(FEAT_GUI_GTK) \
674 || defined(FEAT_GUI_PHOTON) \ 671 || defined(FEAT_GUI_PHOTON) \
675 || defined(FEAT_GUI_HAIKU) \ 672 || defined(FEAT_GUI_HAIKU) \
676 || defined(FEAT_GUI_MSWIN) \ 673 || defined(FEAT_GUI_MSWIN)
677 || defined(FEAT_GUI_MAC)
678 # define FEAT_CON_DIALOG 674 # define FEAT_CON_DIALOG
679 # define FEAT_GUI_DIALOG 675 # define FEAT_GUI_DIALOG
680 # else 676 # else
681 # define FEAT_CON_DIALOG 677 # define FEAT_CON_DIALOG
682 # endif 678 # endif
688 # define FEAT_GUI_DIALOG 684 # define FEAT_GUI_DIALOG
689 #endif 685 #endif
690 #if defined(FEAT_GUI_DIALOG) && \ 686 #if defined(FEAT_GUI_DIALOG) && \
691 (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ 687 (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \
692 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) \ 688 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) \
693 || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC) \ 689 || defined(FEAT_GUI_PHOTON) \
694 || defined(FEAT_GUI_HAIKU)) 690 || defined(FEAT_GUI_HAIKU))
695 # define FEAT_GUI_TEXTDIALOG 691 # define FEAT_GUI_TEXTDIALOG
696 # ifndef ALWAYS_USE_GUI 692 # ifndef ALWAYS_USE_GUI
697 # define FEAT_CON_DIALOG 693 # define FEAT_CON_DIALOG
698 # endif 694 # endif
701 /* 697 /*
702 * +termguicolors 'termguicolors' option. 698 * +termguicolors 'termguicolors' option.
703 */ 699 */
704 #if (defined(FEAT_BIG) && defined(FEAT_SYN_HL)) && !defined(ALWAYS_USE_GUI) 700 #if (defined(FEAT_BIG) && defined(FEAT_SYN_HL)) && !defined(ALWAYS_USE_GUI)
705 # define FEAT_TERMGUICOLORS 701 # define FEAT_TERMGUICOLORS
706 #endif
707
708 // Mac specific thing: Codewarrior interface.
709 #ifdef FEAT_GUI_MAC
710 # define FEAT_CW_EDITOR
711 #endif 702 #endif
712 703
713 /* 704 /*
714 * +vartabs 'vartabstop' and 'varsofttabstop' options. 705 * +vartabs 'vartabstop' and 'varsofttabstop' options.
715 */ 706 */
1089 || (defined(UNIX) && defined(FEAT_NORMAL)) 1080 || (defined(UNIX) && defined(FEAT_NORMAL))
1090 # define CURSOR_SHAPE 1081 # define CURSOR_SHAPE
1091 #endif 1082 #endif
1092 1083
1093 #if defined(FEAT_MZSCHEME) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \ 1084 #if defined(FEAT_MZSCHEME) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \
1094 || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ 1085 || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA))
1095 || defined(FEAT_GUI_MAC))
1096 # define MZSCHEME_GUI_THREADS 1086 # define MZSCHEME_GUI_THREADS
1097 #endif 1087 #endif
1098 1088
1099 /* 1089 /*
1100 * +ARP Amiga only. Use arp.library, DOS 2.0 is not required. 1090 * +ARP Amiga only. Use arp.library, DOS 2.0 is not required.