Mercurial > vim

comparison src/beval.h @ 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 e3dfd25b0679
children ff3c99bd1038
comparison
equal deleted inserted replaced
15867:4a3823e692d3 15868:7fad90423bd2
41 BeState showState; /* tells us whats currently going on */ 41 BeState showState; /* tells us whats currently going on */
42 int x; 42 int x;
43 int y; 43 int y;
44 unsigned int state; /* Button/Modifier key state */ 44 unsigned int state; /* Button/Modifier key state */
45 # else 45 # else
46 # if !defined(FEAT_GUI_W32) 46 # if !defined(FEAT_GUI_MSWIN)
47 Widget target; /* widget we are monitoring */ 47 Widget target; /* widget we are monitoring */
48 Widget balloonShell; 48 Widget balloonShell;
49 Widget balloonLabel; 49 Widget balloonLabel;
50 XtIntervalId timerID; /* timer for run */ 50 XtIntervalId timerID; /* timer for run */
51 BeState showState; /* tells us whats currently going on */ 51 BeState showState; /* tells us whats currently going on */
61 int x; 61 int x;
62 int y; 62 int y;
63 BeState showState; /* tells us whats currently going on */ 63 BeState showState; /* tells us whats currently going on */
64 # endif 64 # endif
65 # endif 65 # endif
66 # if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32) 66 # if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MSWIN)
67 Dimension screen_width; /* screen width in pixels */ 67 Dimension screen_width; /* screen width in pixels */
68 Dimension screen_height; /* screen height in pixels */ 68 Dimension screen_height; /* screen height in pixels */
69 # endif 69 # endif
70 void (*msgCB)(struct BalloonEvalStruct *, int); 70 void (*msgCB)(struct BalloonEvalStruct *, int);
71 void *clientData; /* For callback */ 71 void *clientData; /* For callback */
74 int ts; // tabstop setting for this buffer 74 int ts; // tabstop setting for this buffer
75 #ifdef FEAT_VARTABS 75 #ifdef FEAT_VARTABS
76 int *vts; // vartabstop setting for this buffer 76 int *vts; // vartabstop setting for this buffer
77 #endif 77 #endif
78 char_u *msg; 78 char_u *msg;
79 #ifdef FEAT_GUI_W32 79 #ifdef FEAT_GUI_MSWIN
80 void *tofree; 80 void *tofree;
81 #endif 81 #endif
82 } BalloonEval; 82 } BalloonEval;
83 83
84 #define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */ 84 #define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */