diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-16 10:56:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-16 10:56:25 (GMT) |
| commit | a9827f93eadc2978316098553e09406dae1f5520 (patch) | |
| tree | 4c40167ca8b673d38459b4478944b8bc60cc4a7f /macosx | |
| parent | bc52b8485678245b43a48cec01756c05b11fc17d (diff) | |
| download | tk-a9827f93eadc2978316098553e09406dae1f5520.zip tk-a9827f93eadc2978316098553e09406dae1f5520.tar.gz tk-a9827f93eadc2978316098553e09406dae1f5520.tar.bz2 | |
Add DEF_LABEL_FG for all platforms, not only MacOS. Backport some type-casts from 8.7
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXDefault.h | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXInit.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 2 | ||||
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h index 3a8eb92..5a5ccca 100644 --- a/macosx/tkMacOSXDefault.h +++ b/macosx/tkMacOSXDefault.h @@ -69,7 +69,7 @@ #define DEF_BUTTON_DISABLED_FG_COLOR DISABLED #define DEF_BUTTON_DISABLED_FG_MONO "" #define DEF_BUTTON_FG BLACK -#define DEF_LABEL_FG NORMAL_FG +#define DEF_LABEL_FG NORMAL_FG #define DEF_CHKRAD_FG DEF_LABEL_FG #define DEF_BUTTON_FONT "TkDefaultFont" #define DEF_BUTTON_HEIGHT "0" diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index bd0199a..53508aa 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -208,7 +208,7 @@ static int TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip, * matter what the actual OS version of the host may be. And of course * Apple never released macOS 10.16. To work around this we guess the * OS version from the kernel release number, as reported by uname. - */ + */ struct utsname name; char *endptr; diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index caebd7b..1093816 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -319,7 +319,7 @@ XUnmapWindow( for (NSWindow *w in [NSApp orderedWindows]) { TkWindow *winPtr2 = TkMacOSXGetTkWindow(w); WmInfo *wmInfoPtr; - + BOOL isOnScreen; if (!winPtr2 || !winPtr2->wmInfoPtr) { diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 3334356..52880ef 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -1113,7 +1113,7 @@ static void DrawDarkTab( faceColor = [NSColor colorWithColorSpace: deviceRGB components: darkSelectedTab count: 4]; - } + } SolidFillRoundedRectangle(context, bounds, 4, faceColor); } HighlightButtonBorder(context, bounds); |