comparison src/os_macosx.m @ 17067:d0438b4b0acf v8.1.1533

patch 8.1.1533: GUI build fails on Mac commit https://github.com/vim/vim/commit/2fc39aeeb5ff5101530a89838049e09e2959ad0e Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jun 14 23:27:29 2019 +0200 patch 8.1.1533: GUI build fails on Mac Problem: GUI build fails on Mac. Solution: Change VimClipboard type in non-C file.
author Bram Moolenaar <Bram@vim.org>
date Fri, 14 Jun 2019 23:30:05 +0200
parents 2dcaa860e3fc
children e86237409bd2
comparison
equal deleted inserted replaced
17066:fe6a30921a45 17067:d0438b4b0acf
38 /* Used to identify clipboard data copied from Vim. */ 38 /* Used to identify clipboard data copied from Vim. */
39 39
40 NSString *VimPboardType = @"VimPboardType"; 40 NSString *VimPboardType = @"VimPboardType";
41 41
42 void 42 void
43 clip_mch_lose_selection(VimClipboard *cbd UNUSED) 43 clip_mch_lose_selection(Clipboard_T *cbd UNUSED)
44 { 44 {
45 } 45 }
46 46
47 47
48 int 48 int
49 clip_mch_own_selection(VimClipboard *cbd UNUSED) 49 clip_mch_own_selection(Clipboard_T *cbd UNUSED)
50 { 50 {
51 /* This is called whenever there is a new selection and 'guioptions' 51 /* This is called whenever there is a new selection and 'guioptions'
52 * contains the "a" flag (automatically copy selection). Return TRUE, else 52 * contains the "a" flag (automatically copy selection). Return TRUE, else
53 * the "a" flag does nothing. Note that there is no concept of "ownership" 53 * the "a" flag does nothing. Note that there is no concept of "ownership"
54 * of the clipboard in Mac OS X. 54 * of the clipboard in Mac OS X.
56 return TRUE; 56 return TRUE;
57 } 57 }
58 58
59 59
60 void 60 void
61 clip_mch_request_selection(VimClipboard *cbd) 61 clip_mch_request_selection(Clipboard_T *cbd)
62 { 62 {
63 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; 63 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
64 64
65 NSPasteboard *pb = [NSPasteboard generalPasteboard]; 65 NSPasteboard *pb = [NSPasteboard generalPasteboard];
66 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 66 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
146 146
147 /* 147 /*
148 * Send the current selection to the clipboard. 148 * Send the current selection to the clipboard.
149 */ 149 */
150 void 150 void
151 clip_mch_set_selection(VimClipboard *cbd) 151 clip_mch_set_selection(Clipboard_T *cbd)
152 { 152 {
153 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; 153 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
154 154
155 /* If the '*' register isn't already filled in, fill it in now. */ 155 /* If the '*' register isn't already filled in, fill it in now. */
156 cbd->owned = TRUE; 156 cbd->owned = TRUE;