Merge 9.0 (formatting changes only, "text" is for another day)

tcltk · Oct 8, 2024 · 853df80 · 853df80
2 parents 40aeb02 + b41e497
commit 853df80
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/generic/tkButton.c b/generic/tkButton.c
@@ -1181,7 +1181,7 @@ ConfigureButton(
 		 * selected.
 		 */
 
- 		if ((butPtr->type == TYPE_RADIO_BUTTON) &&
+		if ((butPtr->type == TYPE_RADIO_BUTTON) &&
 			(*Tcl_GetString(butPtr->onValuePtr) == '\0')) {
 		    butPtr->flags |= SELECTED;
 		}

diff --git a/generic/tkButton.h b/generic/tkButton.h
@@ -302,7 +302,7 @@ MODULE_SCOPE void	TkButtonWorldChanged(void *instanceData);
 MODULE_SCOPE void	TkpComputeButtonGeometry(TkButton *butPtr);
 MODULE_SCOPE TkButton	*TkpCreateButton(Tk_Window tkwin);
 #ifndef TkpDestroyButton
-MODULE_SCOPE void 	TkpDestroyButton(TkButton *butPtr);
+MODULE_SCOPE void	TkpDestroyButton(TkButton *butPtr);
 #endif
 #ifndef TkpDisplayButton
 MODULE_SCOPE void	TkpDisplayButton(void *clientData);

diff --git a/generic/tkConfig.c b/generic/tkConfig.c
@@ -70,7 +70,7 @@ typedef struct TkOption {
     const Tk_OptionSpec *specPtr;
 				/* The original spec from the template passed
 				 * to Tk_CreateOptionTable.*/
-    Tk_Uid dbNameUID;	 	/* The Uid form of the option database
+    Tk_Uid dbNameUID;		/* The Uid form of the option database
 				 * name. */
     Tk_Uid dbClassUID;		/* The Uid form of the option database class
 				 * name. */
@@ -1397,7 +1397,7 @@ int
 Tk_SetOptions(
     Tcl_Interp *interp,		/* Interpreter for error reporting. If NULL,
 				 * then no error message is returned.*/
-    void *recordPtr,	    	/* The record to configure. */
+    void *recordPtr,		/* The record to configure. */
     Tk_OptionTable optionTable,	/* Describes valid options. */
     Tcl_Size objc,			/* The number of elements in objv. */
     Tcl_Obj *const objv[],	/* Contains one or more name-value pairs. */

diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c
@@ -561,7 +561,7 @@ ConfigureMenuButton(
 	}
 	if (padY < 0) {
 	    padY = 0;
-		Tcl_DecrRefCount(mbPtr->padYObj);
+	    Tcl_DecrRefCount(mbPtr->padYObj);
 	    mbPtr->padYObj = Tcl_NewIntObj(0);
 	    Tcl_IncrRefCount(mbPtr->padYObj);
 	}

diff --git a/generic/tkMenubutton.h b/generic/tkMenubutton.h
@@ -159,15 +159,15 @@ typedef struct {
 				 * whether the menubutton should show both an
 				 * image and text, and, if so, how. */
     enum direction direction;	/* Direction for where to pop the menu. Valid
-    				 * directions are "above", "below", "flush",
-    				 * "left", and "right". "above" and "below"
-    				 * will attempt to pop the menu completely
-    				 * above or below the menu respectively.
-    				 * "flush" means that the upper left corner
-    				 * of the menubutton is where the menu pops up.
-    				 * "left" and "right" will pop the menu left
-    				 * or right, and the active item will be next
-    				 * to the button. */
+				 * directions are "above", "below", "flush",
+				 * "left", and "right". "above" and "below"
+				 * will attempt to pop the menu completely
+				 * above or below the menu respectively.
+				 * "flush" means that the upper left corner
+				 * of the menubutton is where the menu pops up.
+				 * "left" and "right" will pop the menu left
+				 * or right, and the active item will be next
+				 * to the button. */
     Tk_Cursor cursor;		/* Current cursor for window, or NULL. */
     Tcl_Obj *takeFocusObj;	/* Value of -takefocus option; not used in the
 				 * C code, but used by keyboard traversal
@@ -208,7 +208,7 @@ typedef struct {
 MODULE_SCOPE void	TkpComputeMenuButtonGeometry(TkMenuButton *mbPtr);
 MODULE_SCOPE TkMenuButton *TkpCreateMenuButton(Tk_Window tkwin);
 MODULE_SCOPE void	TkpDisplayMenuButton(void *clientData);
-MODULE_SCOPE void 	TkpDestroyMenuButton(TkMenuButton *mbPtr);
+MODULE_SCOPE void	TkpDestroyMenuButton(TkMenuButton *mbPtr);
 MODULE_SCOPE void	TkMenuButtonWorldChanged(void *instanceData);
 
 #endif /* _TKMENUBUTTON */
diff --git a/xlib/xcolors.c b/xlib/xcolors.c
@@ -306,7 +306,7 @@ colorcmp(
 	    c += 'a' - 'A';
 	} else if (((unsigned)(c - '1') <= (unsigned)('9' - '1'))) {
 	    if (d == '0') {
-	    	d += 10;
+		d += 10;
 	    } else if (!d) {
 		num = c - '0';
 		while ((unsigned)((c = *spec++) - '0') <= (unsigned)('9' - '0')) {
@@ -414,11 +414,11 @@ XParseColor(
 	}
 	if (num > (*p)[31]) {
 	    if (((*p)[31] != 8) || num > 100) {
-	    	return 0;
+		return 0;
 	    }
 	    num = (num * 255 + 50) / 100;
 	    if ((num == 230) || (num == 128)) {
-	    	/*
+		/*
 		 * Those two entries have a deviation i.r.t the table.
 		 */
 

diff --git a/xlib/xgc.c b/xlib/xgc.c
@@ -768,7 +768,7 @@ XRegisterIMInstantiateCallback(
 
 Bool
 XUnregisterIMInstantiateCallback(
-    TCL_UNUSED(Display *) 		/* dpy */,
+    TCL_UNUSED(Display *)		/* dpy */,
     TCL_UNUSED(struct _XrmHashBucketRec *)	/* rdb */,
     TCL_UNUSED(char *)			/* res_name */,
     TCL_UNUSED(char *)			/* res_class */,