Mercurial > vim

comparison src/gui_beval.c @ 15868:7fad90423bd2 v8.1.0941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0941: macros for MS-Windows are inconsistent commit https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 17 17:44:42 2019 +0100 patch 8.1.0941: macros for MS-Windows are inconsistent Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and others. Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the GUI build. (Hirohito Higashi, closes #3932)
author Bram Moolenaar <Bram@vim.org>
date Sun, 17 Feb 2019 17:45:08 +0100
parents 41fbbcea0f1b
children ff3c99bd1038
comparison
equal deleted inserted replaced
15867:4a3823e692d3 15868:7fad90423bd2
11 #include "vim.h" 11 #include "vim.h"
12 12
13 #if defined(FEAT_BEVAL_GUI) || defined(PROTO) 13 #if defined(FEAT_BEVAL_GUI) || defined(PROTO)
14 14
15 /* on Win32 only get_beval_info() is required */ 15 /* on Win32 only get_beval_info() is required */
16 #if !defined(FEAT_GUI_W32) || defined(PROTO) 16 #if !defined(FEAT_GUI_MSWIN) || defined(PROTO)
17 17
18 #ifdef FEAT_GUI_GTK 18 #ifdef FEAT_GUI_GTK
19 # if GTK_CHECK_VERSION(3,0,0) 19 # if GTK_CHECK_VERSION(3,0,0)
20 # include <gdk/gdkkeysyms-compat.h> 20 # include <gdk/gdkkeysyms-compat.h>
21 # else 21 # else
195 gui_mch_currently_showing_beval(void) 195 gui_mch_currently_showing_beval(void)
196 { 196 {
197 return current_beval; 197 return current_beval;
198 } 198 }
199 #endif 199 #endif
200 #endif /* !FEAT_GUI_W32 */ 200 #endif /* !FEAT_GUI_MSWIN */
201 201
202 #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_EVAL) || defined(PROTO) 202 #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_EVAL) || defined(PROTO)
203 # if !defined(FEAT_GUI_W32) || defined(PROTO) 203 # if !defined(FEAT_GUI_MSWIN) || defined(PROTO)
204 204
205 /* 205 /*
206 * Show a balloon with "mesg". 206 * Show a balloon with "mesg".
207 */ 207 */
208 void 208 void
212 if (mesg != NULL) 212 if (mesg != NULL)
213 drawBalloon(beval); 213 drawBalloon(beval);
214 else 214 else
215 undrawBalloon(beval); 215 undrawBalloon(beval);
216 } 216 }
217 # endif /* !FEAT_GUI_W32 */ 217 # endif /* !FEAT_GUI_MSWIN */
218 #endif /* FEAT_NETBEANS_INTG || PROTO */ 218 #endif /* FEAT_NETBEANS_INTG || PROTO */
219 219
220 #if !defined(FEAT_GUI_W32) || defined(PROTO) 220 #if !defined(FEAT_GUI_MSWIN) || defined(PROTO)
221 #if defined(FEAT_BEVAL_TIP) || defined(PROTO) 221 #if defined(FEAT_BEVAL_TIP) || defined(PROTO)
222 /* 222 /*
223 * Hide the given balloon. 223 * Hide the given balloon.
224 */ 224 */
225 void 225 void
1218 labelWidgetClass, beval->balloonShell, args, n); 1218 labelWidgetClass, beval->balloonShell, args, n);
1219 #endif 1219 #endif
1220 } 1220 }
1221 1221
1222 #endif /* !FEAT_GUI_GTK */ 1222 #endif /* !FEAT_GUI_GTK */
1223 #endif /* !FEAT_GUI_W32 */ 1223 #endif /* !FEAT_GUI_MSWIN */
1224 1224
1225 #endif /* FEAT_BEVAL_GUI */ 1225 #endif /* FEAT_BEVAL_GUI */