From 35b2870cff97386ce7ea956ee317bec123017d52 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 3 Aug 2020 17:25:02 +0000 Subject: end-of-line spacing cleanup --- generic/tkCmds.c | 2 +- generic/tkTest.c | 2 +- macosx/tkMacOSXColor.h | 58 ++++++++++++++++++++++----------------------- macosx/tkMacOSXPrivate.h | 2 +- macosx/tkMacOSXSubwindows.c | 4 ++-- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/generic/tkCmds.c b/generic/tkCmds.c index 1bc4f8c..89b5254 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -1755,7 +1755,7 @@ Tk_WinfoObjCmd( * destroyed when we are through with it, so we do not get stale RGB * values next time. */ - + { Colormap temp = Tk_Colormap(tkwin); Tk_Colormap(tkwin) = TK_DYNAMIC_COLORMAP; diff --git a/generic/tkTest.c b/generic/tkTest.c index c22e649..26b3fa5 100644 --- a/generic/tkTest.c +++ b/generic/tkTest.c @@ -1592,7 +1592,7 @@ ImageDisplay( * Drawing is not possible on the first call to DisplayImage. * Save the message, but do not log it until the actual display. */ - + if (instPtr->displayFailed == False) { sprintf(instPtr->buffer, "%s display %d %d %d %d", instPtr->masterPtr->imageName, imageX, imageY, width, height); diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h index 82c88c9..89d147d 100644 --- a/macosx/tkMacOSXColor.h +++ b/macosx/tkMacOSXColor.h @@ -6,7 +6,7 @@ * colors in a GC are unsigned longs. These are meant to be used as indexes * into a table of XColors, where an XColor is declared in Xlib.h as: * typedef struct { - * unsigned long pixel; + * unsigned long pixel; * unsigned short red, green, blue; * char flags; * char pad; @@ -48,7 +48,7 @@ typedef struct xpixel_t { unsigned value: 24; /* Either RGB or an index into systemColorMap. */ unsigned colortype: 8; } xpixel; - + typedef union MacPixel_t { unsigned long ulong; xpixel pixel; @@ -64,11 +64,11 @@ enum macColormap { lightColormap, darkColormap, }; - + /* * In TkMacOSXColor.c a Tk hash table is constructed from the static data * below to map system color names to CGColors. - */ + */ typedef struct { const char *name; @@ -96,15 +96,15 @@ static SystemColorDatum systemColorData[] = { {"HighlightText", HIBrush, kThemeBrushBlack }, {"HighlightAlternate", HIBrush, kThemeBrushAlternatePrimaryHighlightColor }, {"PrimaryHighlightColor", HIBrush, kThemeBrushPrimaryHighlightColor }, -{"ButtonFace", HIBrush, kThemeBrushButtonFaceActive }, +{"ButtonFace", HIBrush, kThemeBrushButtonFaceActive }, {"SecondaryHighlightColor", HIBrush, kThemeBrushSecondaryHighlightColor }, -{"ButtonFrame", HIBrush, kThemeBrushButtonFrameActive }, +{"ButtonFrame", HIBrush, kThemeBrushButtonFrameActive }, {"AlternatePrimaryHighlightColor", HIBrush, kThemeBrushAlternatePrimaryHighlightColor }, -{"WindowBody", HIBrush, kThemeBrushDocumentWindowBackground }, +{"WindowBody", HIBrush, kThemeBrushDocumentWindowBackground }, {"SheetBackground", HIBrush, kThemeBrushSheetBackground }, {"MenuActive", HIBrush, kThemeBrushMenuBackgroundSelected }, {"Menu", HIBrush, kThemeBrushMenuBackground }, -{"DialogBackgroundInactive", HIBrush, kThemeBrushDialogBackgroundInactive }, +{"DialogBackgroundInactive", HIBrush, kThemeBrushDialogBackgroundInactive }, {"DialogBackgroundActive", HIBrush, kThemeBrushDialogBackgroundActive }, {"AlertBackgroundActive", HIBrush, kThemeBrushAlertBackgroundActive }, {"AlertBackgroundInactive", HIBrush, kThemeBrushAlertBackgroundInactive }, @@ -113,28 +113,28 @@ static SystemColorDatum systemColorData[] = { {"UtilityWindowBackgroundActive", HIBrush, kThemeBrushUtilityWindowBackgroundActive }, {"UtilityWindowBackgroundInactive", HIBrush, kThemeBrushUtilityWindowBackgroundInactive }, {"ListViewSortColumnBackground", HIBrush, kThemeBrushListViewSortColumnBackground }, -{"ListViewBackground", HIBrush, kThemeBrushListViewBackground }, +{"ListViewBackground", HIBrush, kThemeBrushListViewBackground }, {"IconLabelBackground", HIBrush, kThemeBrushIconLabelBackground }, -{"ListViewSeparator", HIBrush, kThemeBrushListViewSeparator }, +{"ListViewSeparator", HIBrush, kThemeBrushListViewSeparator }, {"ChasingArrows", HIBrush, kThemeBrushChasingArrows }, -{"DragHilite", HIBrush, kThemeBrushDragHilite }, -{"DocumentWindowBackground", HIBrush, kThemeBrushDocumentWindowBackground }, +{"DragHilite", HIBrush, kThemeBrushDragHilite }, +{"DocumentWindowBackground", HIBrush, kThemeBrushDocumentWindowBackground }, {"FinderWindowBackground", HIBrush, kThemeBrushFinderWindowBackground }, -{"ScrollBarDelimiterActive", HIBrush, kThemeBrushScrollBarDelimiterActive }, -{"ScrollBarDelimiterInactive", HIBrush, kThemeBrushScrollBarDelimiterInactive }, +{"ScrollBarDelimiterActive", HIBrush, kThemeBrushScrollBarDelimiterActive }, +{"ScrollBarDelimiterInactive", HIBrush, kThemeBrushScrollBarDelimiterInactive }, {"FocusHighlight", HIBrush, kThemeBrushFocusHighlight }, -{"PopupArrowActive", HIBrush, kThemeBrushPopupArrowActive }, -{"PopupArrowPressed", HIBrush, kThemeBrushPopupArrowPressed }, -{"PopupArrowInactive", HIBrush, kThemeBrushPopupArrowInactive }, -{"AppleGuideCoachmark", HIBrush, kThemeBrushAppleGuideCoachmark }, +{"PopupArrowActive", HIBrush, kThemeBrushPopupArrowActive }, +{"PopupArrowPressed", HIBrush, kThemeBrushPopupArrowPressed }, +{"PopupArrowInactive", HIBrush, kThemeBrushPopupArrowInactive }, +{"AppleGuideCoachmark", HIBrush, kThemeBrushAppleGuideCoachmark }, {"IconLabelBackgroundSelected", HIBrush, kThemeBrushIconLabelBackgroundSelected }, {"StaticAreaFill", HIBrush, kThemeBrushStaticAreaFill }, {"ActiveAreaFill", HIBrush, kThemeBrushActiveAreaFill }, {"ButtonFrameActive", HIBrush, kThemeBrushButtonFrameActive }, -{"ButtonFrameInactive", HIBrush, kThemeBrushButtonFrameInactive }, -{"ButtonFaceActive", HIBrush, kThemeBrushButtonFaceActive }, -{"ButtonFaceInactive", HIBrush, kThemeBrushButtonFaceInactive }, -{"ButtonFacePressed", HIBrush, kThemeBrushButtonFacePressed }, +{"ButtonFrameInactive", HIBrush, kThemeBrushButtonFrameInactive }, +{"ButtonFaceActive", HIBrush, kThemeBrushButtonFaceActive }, +{"ButtonFaceInactive", HIBrush, kThemeBrushButtonFaceInactive }, +{"ButtonFacePressed", HIBrush, kThemeBrushButtonFacePressed }, {"ButtonActiveDarkShadow", HIBrush, kThemeBrushButtonActiveDarkShadow }, {"ButtonActiveDarkHighlight", HIBrush, kThemeBrushButtonActiveDarkHighlight }, {"ButtonActiveLightShadow", HIBrush, kThemeBrushButtonActiveLightShadow }, @@ -163,10 +163,10 @@ static SystemColorDatum systemColorData[] = { {"ListViewEvenRowBackground", HIBrush, kThemeBrushListViewEvenRowBackground }, {"ListViewColumnDivider", HIBrush, kThemeBrushListViewColumnDivider }, -{"ButtonText", HIText, kThemeTextColorPushButtonActive }, -{"MenuActiveText", HIText, kThemeTextColorMenuItemSelected }, -{"MenuDisabled", HIText, kThemeTextColorMenuItemDisabled }, -{"MenuText", HIText, kThemeTextColorMenuItemActive }, +{"ButtonText", HIText, kThemeTextColorPushButtonActive }, +{"MenuActiveText", HIText, kThemeTextColorMenuItemSelected }, +{"MenuDisabled", HIText, kThemeTextColorMenuItemDisabled }, +{"MenuText", HIText, kThemeTextColorMenuItemActive }, {"BlackText", HIText, kThemeTextColorBlack }, {"DialogActiveText", HIText, kThemeTextColorDialogActive }, {"DialogInactiveText", HIText, kThemeTextColorDialogInactive }, @@ -192,8 +192,8 @@ static SystemColorDatum systemColorData[] = { {"ListViewText", HIText, kThemeTextColorListView }, {"DocumentWindowTitleActiveText", HIText, kThemeTextColorDocumentWindowTitleActive }, {"DocumentWindowTitleInactiveText", HIText, kThemeTextColorDocumentWindowTitleInactive }, -{"MovableModalWindowTitleActiveText", HIText, kThemeTextColorMovableModalWindowTitleActive }, -{"MovableModalWindowTitleInactiveText", HIText, kThemeTextColorMovableModalWindowTitleInactive }, +{"MovableModalWindowTitleActiveText", HIText, kThemeTextColorMovableModalWindowTitleActive }, +{"MovableModalWindowTitleInactiveText", HIText, kThemeTextColorMovableModalWindowTitleInactive }, {"UtilityWindowTitleActiveText", HIText, kThemeTextColorUtilityWindowTitleActive }, {"UtilityWindowTitleInactiveText", HIText, kThemeTextColorUtilityWindowTitleInactive }, {"PopupWindowTitleActiveText", HIText, kThemeTextColorPopupWindowTitleActive }, @@ -231,7 +231,7 @@ static SystemColorDatum systemColorData[] = { * Dynamic Colors */ -{"WindowBackgroundColor", ttkBackground, 0 }, +{"WindowBackgroundColor", ttkBackground, 0 }, {"WindowBackgroundColor1", ttkBackground, 1 }, {"WindowBackgroundColor2", ttkBackground, 2 }, {"WindowBackgroundColor3", ttkBackground, 3 }, diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h index ceca8f8..9005d82 100644 --- a/macosx/tkMacOSXPrivate.h +++ b/macosx/tkMacOSXPrivate.h @@ -150,7 +150,7 @@ typedef union MacKeycode_t { keycode_v v; keycode_x x; } MacKeycode; - + /* * Macros used in tkMacOSXKeyboard.c and tkMacOSXKeyEvent.c. * Note that 0x7f is del and 0xF8FF is the Apple Logo character. diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index a58bab4..8b316fa 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -211,7 +211,7 @@ XMapWindow( * we handle this event immediately and then process the idle * events that it generates. */ - + Tk_HandleEvent(&event); while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {} } else { @@ -329,7 +329,7 @@ XUnmapWindow( * we handle this event immediately and then process the idle * events that it generates. */ - + Tk_HandleEvent(&event); while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {} } else { -- cgit v0.12