diff options
| author | fvogel <fvogelnew1@free.fr> | 2020-07-14 16:28:49 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2020-07-14 16:28:49 (GMT) |
| commit | b794d17b77c6a6901f129c37b58aed8a5253ff87 (patch) | |
| tree | 75f3b7c63a03fb68f7565c0b929c76e2c6cba53b | |
| parent | 92751c3e0866b78b2a36457363948cee95a92ce5 (diff) | |
| download | tk-b794d17b77c6a6901f129c37b58aed8a5253ff87.zip tk-b794d17b77c6a6901f129c37b58aed8a5253ff87.tar.gz tk-b794d17b77c6a6901f129c37b58aed8a5253ff87.tar.bz2 | |
Fix [de0c219db2]: Use platform placeholder text colors as defaults
| -rw-r--r-- | macosx/tkMacOSXDefault.h | 4 | ||||
| -rw-r--r-- | win/tkWinDefault.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h index efaaa91..5675e43 100644 --- a/macosx/tkMacOSXDefault.h +++ b/macosx/tkMacOSXDefault.h @@ -193,7 +193,11 @@ #define DEF_ENTRY_INSERT_WIDTH "1" #define DEF_ENTRY_JUSTIFY "left" #define DEF_ENTRY_PLACEHOLDER "" +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 +#define DEF_ENTRY_PLACEHOLDERFG "placeholderTextColor" +#else #define DEF_ENTRY_PLACEHOLDERFG "#b3b3b3" +#endif #define DEF_ENTRY_READONLY_BG_COLOR NORMAL_BG #define DEF_ENTRY_READONLY_BG_MONO WHITE #define DEF_ENTRY_RELIEF "sunken" diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h index 33756f8..12af282 100644 --- a/win/tkWinDefault.h +++ b/win/tkWinDefault.h @@ -158,7 +158,7 @@ #define DEF_ENTRY_INSERT_WIDTH "2" #define DEF_ENTRY_JUSTIFY "left" #define DEF_ENTRY_PLACEHOLDER "" -#define DEF_ENTRY_PLACEHOLDERFG "#b3b3b3" +#define DEF_ENTRY_PLACEHOLDERFG "COLOR_GRAYTEXT" #define DEF_ENTRY_READONLY_BG_COLOR "SystemButtonFace" #define DEF_ENTRY_READONLY_BG_MONO WHITE #define DEF_ENTRY_RELIEF "sunken" |