Skip to content

Commit e89ff04

Browse files
brammoolbrammool
committed
patch 7.4.1375
Problem: Still some Win16 code. Solution: Remove FEAT_GUI_W16.(Hirohito Higashi)
1 parent af7559f commit e89ff04

File tree

13 files changed

+16
-232
lines changed

13 files changed

+16
-232
lines changed

‎runtime/doc/gui_w16.txt‎

Lines changed: 0 additions & 186 deletions
This file was deleted.

‎src/eval.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13492,9 +13492,6 @@ f_has(typval_T *argvars, typval_T *rettv)
1349213492
#ifdef FEAT_GUI_PHOTON
1349313493
"gui_photon",
1349413494
#endif
13495-
#ifdef FEAT_GUI_W16
13496-
"gui_win16",
13497-
#endif
1349813495
#ifdef FEAT_GUI_W32
1349913496
"gui_win32",
1350013497
#endif

‎src/ex_cmds.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,7 @@ static struct cmdname
9393
ex_func_T cmd_func; /* function for this command */
9494
long_u cmd_argt; /* flags declared above */
9595
int cmd_addr_type; /* flag for address type */
96-
}
97-
# if defined(FEAT_GUI_W16)
98-
_far
99-
# endif
100-
cmdnames[] =
96+
} cmdnames[] =
10197
#else
10298
# define EX(a, b, c, d, e) a
10399
enum CMD_index

‎src/feature.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@
554554
/* #define NO_BUILTIN_TCAPS */
555555
#endif
556556

557-
#if !defined(NO_BUILTIN_TCAPS) && !defined(FEAT_GUI_W16)
557+
#if !defined(NO_BUILTIN_TCAPS)
558558
# ifdef FEAT_BIG
559559
# define ALL_BUILTIN_TCAPS
560560
# else
@@ -1179,7 +1179,7 @@
11791179
# if defined(MSDOS) || (defined(WIN3264) && !defined(FEAT_GUI_W32))
11801180
# define MCH_CURSOR_SHAPE
11811181
# endif
1182-
# if defined(FEAT_GUI_W32) || defined(FEAT_GUI_W16) || defined(FEAT_GUI_MOTIF) \
1182+
# if defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF) \
11831183
|| defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \
11841184
|| defined(FEAT_GUI_PHOTON)
11851185
# define FEAT_MOUSESHAPE

‎src/gui.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,8 @@
148148
#define TEAR_LEN (9) /* length of above string */
149149

150150
/* for the toolbar */
151-
#ifdef FEAT_GUI_W16
152-
# define TOOLBAR_BUTTON_HEIGHT 15
153-
# define TOOLBAR_BUTTON_WIDTH 16
154-
#else
155-
# define TOOLBAR_BUTTON_HEIGHT 18
156-
# define TOOLBAR_BUTTON_WIDTH 18
157-
#endif
151+
#define TOOLBAR_BUTTON_HEIGHT 18
152+
#define TOOLBAR_BUTTON_WIDTH 18
158153
#define TOOLBAR_BORDER_HEIGHT 12 /* room above+below buttons for MSWindows */
159154

160155
#ifdef FEAT_GUI_MSWIN

‎src/menu.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ ex_menu(
102102
int i;
103103
#if defined(FEAT_GUI) && !defined(FEAT_GUI_GTK)
104104
int old_menu_height;
105-
# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_W16)
105+
# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
106106
int old_toolbar_height;
107107
# endif
108108
#endif
@@ -274,7 +274,7 @@ ex_menu(
274274
}
275275
#if defined(FEAT_GUI) && !(defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON))
276276
old_menu_height = gui.menu_height;
277-
# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_W16)
277+
# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
278278
old_toolbar_height = gui.toolbar_height;
279279
# endif
280280
#endif
@@ -395,7 +395,7 @@ ex_menu(
395395
/* If the menubar height changed, resize the window */
396396
if (gui.in_use
397397
&& (gui.menu_height != old_menu_height
398-
# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_W16)
398+
# if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
399399
|| gui.toolbar_height != old_toolbar_height
400400
# endif
401401
))

‎src/misc1.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9734,7 +9734,7 @@ static int vim_backtick(char_u *p);
97349734
static int expand_backtick(garray_T *gap, char_u *pat, int flags);
97359735
# endif
97369736

9737-
# if defined(MSDOS) || defined(FEAT_GUI_W16) || defined(WIN3264)
9737+
# if defined(MSDOS) || defined(WIN3264)
97389738
/*
97399739
* File name expansion code for MS-DOS, Win16 and Win32. It's here because
97409740
* it's shared between these systems.
@@ -10078,7 +10078,7 @@ mch_expandpath(
1007810078
{
1007910079
return dos_expandpath(gap, path, 0, flags, FALSE);
1008010080
}
10081-
# endif /* MSDOS || FEAT_GUI_W16 || WIN3264 */
10081+
# endif /* MSDOS || WIN3264 */
1008210082

1008310083
#if (defined(UNIX) && !defined(VMS)) || defined(USE_UNIXFILENAME) \
1008410084
|| defined(PROTO)

‎src/option.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -488,11 +488,7 @@ struct vimoption
488488
* The options with a NULL variable are 'hidden': a set command for them is
489489
* ignored and they are not printed.
490490
*/
491-
static struct vimoption
492-
#ifdef FEAT_GUI_W16
493-
_far
494-
#endif
495-
options[] =
491+
static struct vimoption options[] =
496492
{
497493
{"aleph", "al", P_NUM|P_VI_DEF|P_CURSWANT,
498494
#ifdef FEAT_RIGHTLEFT

‎src/proto.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,6 @@ extern int putenv(const char *string); /* from pty.c */
211211
extern char_u *vimpty_getenv(const char_u *string); /* from pty.c */
212212
# endif
213213
# endif
214-
# ifdef FEAT_GUI_W16
215-
# include "gui_w16.pro"
216-
# endif
217214
# ifdef FEAT_GUI_W32
218215
# include "gui_w32.pro"
219216
# endif

‎src/structs.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,10 +2720,6 @@ struct VimMenu
27202720
#ifdef FEAT_BEVAL_TIP
27212721
BalloonEval *tip; /* tooltip for this menu item */
27222722
#endif
2723-
#ifdef FEAT_GUI_W16
2724-
UINT id; /* Id of menu item */
2725-
HMENU submenu_id; /* If this is submenu, add children here */
2726-
#endif
27272723
#ifdef FEAT_GUI_W32
27282724
UINT id; /* Id of menu item */
27292725
HMENU submenu_id; /* If this is submenu, add children here */

0 commit comments

Comments
 (0)