Mercurial > vim
comparison src/gui.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 | bdda90ed5f6c |
comparison
equal
deleted
inserted
replaced
21744:805e8d18b78b | 21745:35921b7fc07a |
---|---|
37 #if defined(FEAT_XCLIPBOARD) && !defined(FEAT_GUI_MOTIF) \ | 37 #if defined(FEAT_XCLIPBOARD) && !defined(FEAT_GUI_MOTIF) \ |
38 && !defined(FEAT_GUI_ATHENA) && !defined(FEAT_GUI_GTK) | 38 && !defined(FEAT_GUI_ATHENA) && !defined(FEAT_GUI_GTK) |
39 # include <X11/Intrinsic.h> | 39 # include <X11/Intrinsic.h> |
40 #endif | 40 #endif |
41 | 41 |
42 #ifdef FEAT_GUI_MAC | |
43 # include <Types.h> | |
44 /*# include <Memory.h>*/ | |
45 # include <Quickdraw.h> | |
46 # include <Fonts.h> | |
47 # include <Events.h> | |
48 # include <Menus.h> | |
49 # if !(defined (TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON)) | |
50 # include <Windows.h> | |
51 # endif | |
52 # include <Controls.h> | |
53 /*# include <TextEdit.h>*/ | |
54 # include <Dialogs.h> | |
55 # include <OSUtils.h> | |
56 /* | |
57 # include <ToolUtils.h> | |
58 # include <SegLoad.h>*/ | |
59 #endif | |
60 | |
61 #ifdef FEAT_GUI_PHOTON | 42 #ifdef FEAT_GUI_PHOTON |
62 # include <Ph.h> | 43 # include <Ph.h> |
63 # include <Pt.h> | 44 # include <Pt.h> |
64 # include "photon/PxProto.h" | 45 # include "photon/PxProto.h" |
65 #endif | 46 #endif |
66 | 47 |
67 /* | 48 /* |
68 * On some systems scrolling needs to be done right away instead of in the | 49 * On some systems scrolling needs to be done right away instead of in the |
69 * main loop. | 50 * main loop. |
70 */ | 51 */ |
71 #if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MAC) || defined(FEAT_GUI_GTK) | 52 #if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) |
72 # define USE_ON_FLY_SCROLL | 53 # define USE_ON_FLY_SCROLL |
73 #endif | 54 #endif |
74 | 55 |
75 /* | 56 /* |
76 * GUIs that support dropping files on a running Vim. | 57 * GUIs that support dropping files on a running Vim. |
77 */ | 58 */ |
78 #if (defined(FEAT_DND) && defined(FEAT_GUI_GTK)) \ | 59 #if (defined(FEAT_DND) && defined(FEAT_GUI_GTK)) \ |
79 || defined(FEAT_GUI_MSWIN) \ | 60 || defined(FEAT_GUI_MSWIN) \ |
80 || defined(FEAT_GUI_MAC) \ | |
81 || defined(FEAT_GUI_HAIKU) | 61 || defined(FEAT_GUI_HAIKU) |
82 # define HAVE_DROP_FILE | 62 # define HAVE_DROP_FILE |
83 #endif | 63 #endif |
84 | 64 |
85 /* | 65 /* |
206 // to reduce the count. | 186 // to reduce the count. |
207 #endif | 187 #endif |
208 | 188 |
209 #if FEAT_GUI_HAIKU | 189 #if FEAT_GUI_HAIKU |
210 VimScrollBar *id; // Pointer to real scroll bar | 190 VimScrollBar *id; // Pointer to real scroll bar |
211 #endif | |
212 #ifdef FEAT_GUI_MAC | |
213 ControlHandle id; // A handle to the scrollbar | |
214 #endif | 191 #endif |
215 #ifdef FEAT_GUI_PHOTON | 192 #ifdef FEAT_GUI_PHOTON |
216 PtWidget_t *id; | 193 PtWidget_t *id; |
217 #endif | 194 #endif |
218 } scrollbar_T; | 195 } scrollbar_T; |
433 guint32 event_time; | 410 guint32 event_time; |
434 #endif // FEAT_GUI_GTK | 411 #endif // FEAT_GUI_GTK |
435 | 412 |
436 #if defined(FEAT_GUI_TABLINE) \ | 413 #if defined(FEAT_GUI_TABLINE) \ |
437 && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ | 414 && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ |
438 || defined(FEAT_GUI_MAC) || defined(FEAT_GUI_HAIKU)) | 415 || defined(FEAT_GUI_HAIKU)) |
439 int tabline_height; | 416 int tabline_height; |
440 #endif | 417 #endif |
441 | 418 |
442 #ifdef FEAT_FOOTER | 419 #ifdef FEAT_FOOTER |
443 int footer_height; // height of the message footer | 420 int footer_height; // height of the message footer |
469 VimApp *vimApp; | 446 VimApp *vimApp; |
470 VimWindow *vimWindow; | 447 VimWindow *vimWindow; |
471 VimFormView *vimForm; | 448 VimFormView *vimForm; |
472 VimTextAreaView *vimTextArea; | 449 VimTextAreaView *vimTextArea; |
473 int vdcmp; // Vim Direct Communication Message Port | 450 int vdcmp; // Vim Direct Communication Message Port |
474 #endif | |
475 | |
476 #ifdef FEAT_GUI_MAC | |
477 WindowPtr VimWindow; | |
478 MenuHandle MacOSHelpMenu; // Help menu provided by the MacOS | |
479 int MacOSHelpItems; // Nr of help-items supplied by MacOS | |
480 WindowPtr wid; // Window id of text area | |
481 int visibility; // Is window partially/fully obscured? | |
482 #endif | 451 #endif |
483 | 452 |
484 #ifdef FEAT_GUI_PHOTON | 453 #ifdef FEAT_GUI_PHOTON |
485 PtWidget_t *vimWindow; // PtWindow | 454 PtWidget_t *vimWindow; // PtWindow |
486 PtWidget_t *vimTextArea; // PtRaw | 455 PtWidget_t *vimTextArea; // PtRaw |
597 # else | 566 # else |
598 # define FUNC2GENERIC(func) G_CALLBACK(func) | 567 # define FUNC2GENERIC(func) G_CALLBACK(func) |
599 # endif | 568 # endif |
600 #endif // FEAT_GUI_GTK | 569 #endif // FEAT_GUI_GTK |
601 | 570 |
602 #if defined(UNIX) && !defined(FEAT_GUI_MAC) | 571 #if defined(UNIX) |
603 # define GUI_MAY_FORK | 572 # define GUI_MAY_FORK |
604 #endif | 573 #endif |