From d33ec160fcb423ae472eab7f3aeda20006e28d6b Mon Sep 17 00:00:00 2001 From: fvogel Date: Tue, 14 Jul 2020 20:50:38 +0000 Subject: Bring Windows documentation up-to-date with respect to the new color systemPlaceholderTextColor. --- doc/colors.n | 19 ++++++++++--------- win/tkWinColor.c | 2 +- win/tkWinDefault.h | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/doc/colors.n b/doc/colors.n index 4af3a7a..6e3e64e 100644 --- a/doc/colors.n +++ b/doc/colors.n @@ -970,19 +970,20 @@ On Windows, the following additional system colors are available .RS .DS .ta 6c -system3dDarkShadow systemHighlight -system3dLight systemHighlightText -systemActiveBorder systemInactiveBorder -systemActiveCaption systemInactiveCaption -systemAppWorkspace systemInactiveCaptionText -systemBackground systemInfoBackground -systemButtonFace systemInfoText -systemButtonHighlight systemMenu -systemButtonShadow systemMenuText +system3dDarkShadow systemHighlightText +system3dLight systemInactiveBorder +systemActiveBorder systemInactiveCaption +systemActiveCaption systemInactiveCaptionText +systemAppWorkspace systemInfoBackground +systemBackground systemInfoText +systemButtonFace systemMenu +systemButtonHighlight systemMenuText +systemButtonShadow systemPlaceholderTextColor systemButtonText systemScrollbar systemCaptionText systemWindow systemDisabledText systemWindowFrame systemGrayText systemWindowText +systemHighlight .DE .RE .SH "SEE ALSO" diff --git a/win/tkWinColor.c b/win/tkWinColor.c index ab43304..bb7d859 100644 --- a/win/tkWinColor.c +++ b/win/tkWinColor.c @@ -58,7 +58,7 @@ static const SystemColorEntry sysColors[] = { {"InfoText", COLOR_INFOTEXT}, {"Menu", COLOR_MENU}, {"MenuText", COLOR_MENUTEXT}, - {"PlaceHolderText", COLOR_GRAYTEXT}, + {"PlaceHolderTextColor", COLOR_GRAYTEXT}, {"Scrollbar", COLOR_SCROLLBAR}, {"Window", COLOR_WINDOW}, {"WindowFrame", COLOR_WINDOWFRAME}, diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h index eaceb42..a690a5c 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 "SystemPlaceHolderText" +#define DEF_ENTRY_PLACEHOLDERFG "SystemPlaceHolderTextColor" #define DEF_ENTRY_READONLY_BG_COLOR "SystemButtonFace" #define DEF_ENTRY_READONLY_BG_MONO WHITE #define DEF_ENTRY_RELIEF "sunken" -- cgit v0.12