Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Correct some default font IDs

Browse Source
This commit is contained in:
Pierre-Noel Bouteville
2016-12-10 07:46:54 -06:00
committed by Gregory Nutt
parent 4c68c93f47
commit e9d3c3362a
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/nx/nxfonts.h
+22 -22
View File
@@ -124,70 +124,70 @@
/* X11 misc fixed fonts */ /* X11 misc fixed fonts */
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_4X6) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_4X6)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_4X6 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_4X6
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X7) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X7)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_5X7 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_5X7
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X8) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X8)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_5X8 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_5X8
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X9) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X9)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X9 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X9
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X10) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X10)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X10 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X10
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X12) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X12)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X12 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X12
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X13
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13B) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13B)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13B # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X13B
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13O) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13O)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13O # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X13O
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X13
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13B) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13B)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13B # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X13B
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13O) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13O)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13O # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X13O
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X14 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X14
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14B) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14B)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X14B # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X14B
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_8X13
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13B) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13B)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13B # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_8X13B
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13O) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13O)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13O # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_8X13O
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X15 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_9X15
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15B) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15B)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X15B # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_9X15B
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X18 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_9X18
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18B) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18B)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X18B # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_9X18B
#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_10X20) #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_10X20)
# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_10X20 # define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_10X20
/* Mono-space fonts */ /* Mono-space fonts */