More elimination of pre-C89-isms.

FossilOrigin-Name: de0b3fd99c0129446985e4cca1e3384f865f749f

1 files changed, 201 insertions, 196 deletions

diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index b4d5705..e2cda93 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinWm.c,v 1.125 2008/04/27 22:39:17 dkf Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.126 2008/05/02 10:28:18 dkf Exp $
  */
 
 #include "tkWinInt.h"
@@ -646,7 +646,7 @@ static LPSTR
 FindDIBBits(
     LPSTR lpbi)
 {
-    return lpbi + *(LPDWORD)lpbi + PaletteSize(lpbi);
+    return lpbi + *((LPDWORD) lpbi) + PaletteSize(lpbi);
 }
 
 /*
@@ -702,7 +702,7 @@ AdjustIconImagePointers(
      * BITMAPINFO is at beginning of bits.
      */
 
-    lpImage->lpbi = (LPBITMAPINFO)lpImage->lpBits;
+    lpImage->lpbi = (LPBITMAPINFO) lpImage->lpBits;
 
     /*
      * Width - simple enough.
@@ -728,14 +728,14 @@ AdjustIconImagePointers(
      * XOR bits follow the header and color table.
      */
 
-    lpImage->lpXOR = (LPBYTE)FindDIBBits(((LPSTR)lpImage->lpbi));
+    lpImage->lpXOR = (LPBYTE) FindDIBBits((LPSTR) lpImage->lpbi);
 
     /*
      * AND bits follow the XOR bits.
      */
 
-    lpImage->lpAND = lpImage->lpXOR + (lpImage->Height*
-	    BytesPerLine((LPBITMAPINFOHEADER)(lpImage->lpbi)));
+    lpImage->lpAND = lpImage->lpXOR +
+	    lpImage->Height*BytesPerLine((LPBITMAPINFOHEADER) lpImage->lpbi);
     return TRUE;
 }
 
@@ -758,18 +758,15 @@ MakeIconOrCursorFromResource(
     LPICONIMAGE lpIcon,
     BOOL isIcon)
 {
-    HICON hIcon ;
-    static FARPROC pfnCreateIconFromResourceEx=NULL;
-    static int initinfo=0;
+    HICON hIcon;
+    static FARPROC pfnCreateIconFromResourceEx = NULL;
+    static int initinfo = 0;
 
     /*
      * Sanity Check
      */
 
-    if (lpIcon == NULL) {
-	return NULL;
-    }
-    if (lpIcon->lpBits == NULL) {
+    if (lpIcon == NULL || lpIcon->lpBits == NULL) {
 	return NULL;
     }
 
@@ -788,10 +785,10 @@ MakeIconOrCursorFromResource(
      */
 
     if (pfnCreateIconFromResourceEx != NULL) {
-	hIcon = (HICON) (pfnCreateIconFromResourceEx) (lpIcon->lpBits,
+	hIcon = (HICON) pfnCreateIconFromResourceEx(lpIcon->lpBits,
 		lpIcon->dwNumBytes, isIcon, 0x00030000,
-		(*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biWidth,
-		(*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biHeight/2, 0);
+		(*(LPBITMAPINFOHEADER) lpIcon->lpBits).biWidth,
+		(*(LPBITMAPINFOHEADER) lpIcon->lpBits).biHeight/2, 0);
     } else {
 	 hIcon = NULL;
     }
@@ -800,7 +797,7 @@ MakeIconOrCursorFromResource(
      * It failed, odds are good we're on NT so try the non-Ex way.
      */
 
-    if (hIcon == NULL)    {
+    if (hIcon == NULL) {
 	/*
 	 * We would break on NT if we try with a 16bpp image.
 	 */
@@ -831,18 +828,19 @@ static int
 ReadICOHeader(
     Tcl_Channel channel)
 {
-    WORD Input;
-    DWORD dwBytesRead;
+    union {
+	WORD word;
+	char bytes[sizeof(WORD)];
+    } input;
 
     /*
      * Read the 'reserved' WORD, which should be a zero word.
      */
 
-    dwBytesRead = Tcl_Read(channel, (char*) &Input, sizeof(WORD));
-    if (dwBytesRead != sizeof(WORD)) {
+    if (Tcl_Read(channel, input.bytes, sizeof(WORD)) != sizeof(WORD)) {
 	return -1;
     }
-    if (Input != 0) {
+    if (input.word != 0) {
 	return -1;
     }
 
@@ -850,28 +848,21 @@ ReadICOHeader(
      * Read the type WORD, which should be of type 1.
      */
 
-    dwBytesRead = Tcl_Read(channel, (char*)&Input, sizeof(WORD));
-    if (dwBytesRead != sizeof(WORD)) {
+    if (Tcl_Read(channel, input.bytes, sizeof(WORD)) != sizeof(WORD)) {
 	return -1;
     }
-    if (Input != 1) {
+    if (input.word != 1) {
 	return -1;
     }
 
     /*
-     * Get the count of images
+     * Get and return the count of images.
      */
 
-    dwBytesRead = Tcl_Read( channel, (char*)&Input, sizeof( WORD ));
-    if (dwBytesRead != sizeof(WORD)) {
+    if (Tcl_Read(channel, input.bytes, sizeof(WORD)) != sizeof(WORD)) {
 	return -1;
     }
-
-    /*
-     * Return the count
-     */
-
-    return (int)Input;
+    return (int) input.word;
 }
 
 /*
@@ -894,23 +885,25 @@ static int
 InitWindowClass(
     WinIconPtr titlebaricon)
 {
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+    ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    if (! tsdPtr->initialized) {
+    if (!tsdPtr->initialized) {
 	tsdPtr->initialized = 1;
 	tsdPtr->firstWindow = 1;
 	tsdPtr->iconPtr = NULL;
     }
-    if (! initialized) {
+    if (!initialized) {
 	Tcl_MutexLock(&winWmMutex);
-	if (! initialized) {
+	if (!initialized) {
 	    Tcl_DString classString;
 	    WNDCLASS class;
+
 	    initialized = 1;
 
 	    if (shgetfileinfoProc == NULL) {
 		HINSTANCE hInstance = LoadLibraryA("shell32");
+
 		if (hInstance != NULL) {
 		    shgetfileinfoProc = (DWORD* (WINAPI *) (LPCTSTR pszPath,
 			    DWORD dwFileAttributes, SHFILEINFO* psfi,
@@ -921,6 +914,7 @@ InitWindowClass(
 	    }
 	    if (setLayeredWindowAttributesProc == NULL) {
 		HINSTANCE hInstance = LoadLibraryA("user32");
+
 		if (hInstance != NULL) {
 		    setLayeredWindowAttributesProc = (BOOL (WINAPI*)(HWND hwnd,
 			    COLORREF crKey, BYTE bAlpha, DWORD dwFlags))
@@ -958,7 +952,7 @@ InitWindowClass(
 	    }
 	    class.hCursor = LoadCursor(NULL, IDC_ARROW);
 
-	    if (!(*tkWinProcs->registerClass)(&class)) {
+	    if (!tkWinProcs->registerClass(&class)) {
 		Tcl_Panic("Unable to register TkTopLevel class");
 	    }
 
@@ -1045,7 +1039,7 @@ WinSetIcon(
      * We must get the window's wrapper, not the window itself.
      */
 
-    wmPtr = ((TkWindow*)tkw)->wmInfoPtr;
+    wmPtr = ((TkWindow *) tkw)->wmInfoPtr;
     hwnd = wmPtr->wrapper;
 
     if (application) {
@@ -1119,7 +1113,7 @@ WinSetIcon(
 	     */
 
 	    UpdateWrapper(wmPtr->winPtr);
-	    wmPtr = ((TkWindow*)tkw)->wmInfoPtr;
+	    wmPtr = ((TkWindow *) tkw)->wmInfoPtr;
 	    hwnd = wmPtr->wrapper;
 	    if (hwnd == NULL) {
 		Tcl_AppendResult(interp,
@@ -1178,7 +1172,7 @@ TkWinGetIcon(
 {
     WmInfo *wmPtr;
     HICON icon;
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+    ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (tsdPtr->iconPtr != NULL) {
@@ -1186,7 +1180,7 @@ TkWinGetIcon(
 	 * return default toplevel icon
 	 */
 
-	return GetIcon(tsdPtr->iconPtr, (int)iconsize);
+	return GetIcon(tsdPtr->iconPtr, (int) iconsize);
     }
 
     /*
@@ -1210,7 +1204,7 @@ TkWinGetIcon(
 	 * return window toplevel icon
 	 */
 
-	return GetIcon(wmPtr->iconPtr, (int)iconsize);
+	return GetIcon(wmPtr->iconPtr, (int) iconsize);
     }
 
     /*
@@ -1272,11 +1266,13 @@ ReadIconFromFile(
     WinIconPtr titlebaricon = NULL;
     BlockOfIconImagesPtr lpIR;
 
+#if 0 /* TODO: Dead code? */
     if (0 /* If we already have an icon for this filename */) {
 	titlebaricon = NULL; /* Get the real value from a lookup */
 	titlebaricon->refCount++;
 	return titlebaricon;
     }
+#endif
 
     /*
      * First check if it is a .ico file.
@@ -1302,7 +1298,7 @@ ReadIconFromFile(
 	}
 	Tcl_UtfToExternalDString(NULL, file, -1, &ds2);
 	Tcl_DStringFree(&ds);
-	res = (*shgetfileinfoProc)(Tcl_DStringValue(&ds2), 0, &sfiSM,
+	res = shgetfileinfoProc(Tcl_DStringValue(&ds2), 0, &sfiSM,
 		sizeof(SHFILEINFO), SHGFI_SMALLICON|SHGFI_ICON);
 
 	if (res != 0) {
@@ -1310,7 +1306,7 @@ ReadIconFromFile(
 	    unsigned size;
 
 	    Tcl_ResetResult(interp);
-	    res = (*shgetfileinfoProc)(Tcl_DStringValue(&ds2), 0, &sfi,
+	    res = shgetfileinfoProc(Tcl_DStringValue(&ds2), 0, &sfi,
 		    sizeof(SHFILEINFO), SHGFI_ICON);
 
 	    /*
@@ -1395,7 +1391,7 @@ GetIconFromPixmap(
     Pixmap pixmap)
 {
     WinIconPtr titlebaricon = NULL;
-    TkWinDrawable *twdPtr = (TkWinDrawable*) pixmap;
+    TkWinDrawable *twdPtr = (TkWinDrawable *) pixmap;
     BlockOfIconImagesPtr lpIR;
     ICONINFO icon;
     HICON hIcon;
@@ -1405,11 +1401,13 @@ GetIconFromPixmap(
 	return NULL;
     }
 
+#if 0 /* TODO: Dead code?*/
     if (0 /* If we already have an icon for this pixmap */) {
 	titlebaricon = NULL; /* Get the real value from a lookup */
 	titlebaricon->refCount++;
 	return titlebaricon;
     }
+#endif
 
     Tk_SizeOfBitmap(dsPtr, pixmap, &width, &height);
 
@@ -1481,7 +1479,7 @@ DecrIconRefCount(
 	}
 	titlebaricon->iconBlock = NULL;
 
-	ckfree((char*)titlebaricon);
+	ckfree((char *) titlebaricon);
     }
 }
 
@@ -1512,15 +1510,15 @@ FreeIconBlock(
      * Free all the bits.
      */
 
-    for (i=0; i< lpIR->nNumImages; i++) {
+    for (i=0 ; i<lpIR->nNumImages ; i++) {
 	if (lpIR->IconImages[i].lpBits != NULL) {
-	    ckfree((char*)lpIR->IconImages[i].lpBits);
+	    ckfree((char *) lpIR->IconImages[i].lpBits);
 	}
 	if (lpIR->IconImages[i].hIcon != NULL) {
 	    DestroyIcon(lpIR->IconImages[i].hIcon);
 	}
     }
-    ckfree ((char*)lpIR);
+    ckfree((char *) lpIR);
 }
 
 /*
@@ -1542,6 +1540,8 @@ GetIcon(
     int icon_size)
 {
     BlockOfIconImagesPtr lpIR;
+    unsigned int size = (icon_size == 0 ? 16 : 32);
+    int i;
 
     if (titlebaricon == NULL) {
 	return NULL;
@@ -1550,30 +1550,27 @@ GetIcon(
     lpIR = titlebaricon->iconBlock;
     if (lpIR == NULL) {
 	return NULL;
-    } else {
-	unsigned int size = (icon_size == 0 ? 16 : 32);
-	int i;
-
-	for (i = 0; i < lpIR->nNumImages; i++) {
-	    /*
-	     * Take the first or a 32x32 16 color icon
-	     */
-
-	    if ((lpIR->IconImages[i].Height == size)
-		    && (lpIR->IconImages[i].Width == size)
-		    && (lpIR->IconImages[i].Colors >= 4)) {
-		return lpIR->IconImages[i].hIcon;
-	    }
-	}
+    }
 
+    for (i=0 ; i<lpIR->nNumImages ; i++) {
 	/*
-	 * If we get here, then just return the first one, it will have to do!
+	 * Take the first or a 32x32 16 color icon
 	 */
 
-	if (lpIR->nNumImages >= 1) {
-	    return lpIR->IconImages[0].hIcon;
+	if ((lpIR->IconImages[i].Height == size)
+		&& (lpIR->IconImages[i].Width == size)
+		&& (lpIR->IconImages[i].Colors >= 4)) {
+	    return lpIR->IconImages[i].hIcon;
 	}
     }
+
+    /*
+     * If we get here, then just return the first one, it will have to do!
+     */
+
+    if (lpIR->nNumImages >= 1) {
+	return lpIR->IconImages[0].hIcon;
+    }
     return NULL;
 }
 
@@ -1658,10 +1655,11 @@ ReadIconOrCursorFromFile(
      * Read in the header
      */
 
-    if ((lpIR->nNumImages = ReadICOHeader(channel)) == -1) {
+    lpIR->nNumImages = ReadICOHeader(channel);
+    if (lpIR->nNumImages == -1) {
 	Tcl_AppendResult(interp, "Invalid file header", NULL);
 	Tcl_Close(NULL, channel);
-	ckfree((char*) lpIR);
+	ckfree((char *) lpIR);
 	return NULL;
     }
 
@@ -1669,9 +1667,9 @@ ReadIconOrCursorFromFile(
      * Adjust the size of the struct to account for the images.
      */
 
-    lpIR = (BlockOfIconImagesPtr) ckrealloc((char*) lpIR,
+    lpIR = (BlockOfIconImagesPtr) ckrealloc((char *) lpIR,
 	    sizeof(BlockOfIconImages)
-	    + ((lpIR->nNumImages - 1) * sizeof(ICONIMAGE)));
+	    + (lpIR->nNumImages - 1) * sizeof(ICONIMAGE));
 
     /*
      * Allocate enough memory for the icon directory entries.
@@ -1683,8 +1681,8 @@ ReadIconOrCursorFromFile(
      * Read in the icon directory entries.
      */
 
-    dwBytesRead = Tcl_Read(channel, (char*) lpIDE,
-	    (int)(lpIR->nNumImages * sizeof(ICONDIRENTRY)));
+    dwBytesRead = Tcl_Read(channel, (char *) lpIDE,
+	    (int) (lpIR->nNumImages * sizeof(ICONDIRENTRY)));
     if (dwBytesRead != lpIR->nNumImages * sizeof(ICONDIRENTRY)) {
 	Tcl_AppendResult(interp, "Error reading file", NULL);
 	Tcl_Close(NULL, channel);
@@ -1791,7 +1789,7 @@ static TkWindow *
 GetTopLevel(
     HWND hwnd)
 {
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+    ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -1933,8 +1931,7 @@ TkWinWmCleanup(
     }
     initialized = 0;
 
-    tsdPtr = (ThreadSpecificData *)
-	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (!tsdPtr->initialized) {
 	return;
@@ -1965,9 +1962,7 @@ void
 TkWmNewWindow(
     TkWindow *winPtr)		/* Newly-created top-level window. */
 {
-    register WmInfo *wmPtr;
-
-    wmPtr = (WmInfo *) ckalloc(sizeof(WmInfo));
+    register WmInfo *wmPtr = (WmInfo *) ckalloc(sizeof(WmInfo));
 
     /*
      * Initialize full structure, then set what isn't NULL
@@ -2019,7 +2014,7 @@ TkWmNewWindow(
      */
 
     Tk_CreateEventHandler((Tk_Window) winPtr, StructureNotifyMask,
-	    TopLevelEventProc, (ClientData) winPtr);
+	    TopLevelEventProc, winPtr);
 
     /*
      * Arrange for geometry requests to be reflected from the window to the
@@ -2061,7 +2056,7 @@ UpdateWrapper(
     HICON hBigIcon = NULL;
     Tcl_DString titleString, classString;
     int *childStateInfo = NULL;
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+    ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (winPtr->window == None) {
@@ -2129,8 +2124,8 @@ UpdateWrapper(
 	    wmPtr->style = WM_TRANSIENT_STYLE;
 	    wmPtr->exStyle = EX_TRANSIENT_STYLE;
 	    parentHWND = Tk_GetHWND(Tk_WindowId(wmPtr->masterPtr));
-	    if (! ((wmPtr->flags & WM_WIDTH_NOT_RESIZABLE) &&
-		    (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE))) {
+	    if (! ((wmPtr->flags & WM_WIDTH_NOT_RESIZABLE)
+		    && (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE))) {
 		wmPtr->style |= WS_THICKFRAME;
 	    }
 	} else {
@@ -2151,7 +2146,7 @@ UpdateWrapper(
 	 */
 
 	wmPtr->flags |= WM_CREATE_PENDING|WM_MOVE_PENDING;
-	UpdateGeometryInfo((ClientData)winPtr);
+	UpdateGeometryInfo(winPtr);
 	wmPtr->flags &= ~(WM_CREATE_PENDING|WM_MOVE_PENDING);
 
 	width = wmPtr->borderWidth + winPtr->changes.width;
@@ -2189,7 +2184,7 @@ UpdateWrapper(
 
 	Tcl_WinUtfToTChar(TK_WIN_TOPLEVEL_CLASS_NAME, -1, &classString);
 
-	wmPtr->wrapper = (*tkWinProcs->createWindowEx)(wmPtr->exStyle,
+	wmPtr->wrapper = tkWinProcs->createWindowEx(wmPtr->exStyle,
 		(LPCTSTR) Tcl_DStringValue(&classString),
 		(LPCTSTR) Tcl_DStringValue(&titleString),
 		wmPtr->style, x, y, width, height,
@@ -2296,11 +2291,11 @@ UpdateWrapper(
     }
 
     wmPtr->flags &= ~WM_NEVER_MAPPED;
-    if (winPtr->flags & TK_EMBEDDED
-	    && SendMessage(wmPtr->wrapper, TK_ATTACHWINDOW, (WPARAM)child, 0)){
+    if (winPtr->flags & TK_EMBEDDED &&
+	    SendMessage(wmPtr->wrapper, TK_ATTACHWINDOW, (WPARAM) child, 0)) {
 	SendMessage(wmPtr->wrapper, TK_GEOMETRYREQ,
-		Tk_ReqWidth((Tk_Window)winPtr),
-		Tk_ReqHeight((Tk_Window)winPtr));
+		Tk_ReqWidth((Tk_Window) winPtr),
+		Tk_ReqHeight((Tk_Window) winPtr));
 	SendMessage(wmPtr->wrapper, TK_SETMENU, (WPARAM) wmPtr->hMenu,
 		(LPARAM) Tk_GetMenuHWND((Tk_Window) winPtr));
     }
@@ -2321,10 +2316,11 @@ UpdateWrapper(
     wmPtr->hints.initial_state = state;
 
     if (hSmallIcon != NULL) {
-	SendMessage(wmPtr->wrapper,WM_SETICON,ICON_SMALL,(LPARAM)hSmallIcon);
+	SendMessage(wmPtr->wrapper, WM_SETICON, ICON_SMALL,
+		(LPARAM) hSmallIcon);
     }
     if (hBigIcon != NULL) {
-	SendMessage(wmPtr->wrapper,WM_SETICON,ICON_BIG,(LPARAM)hBigIcon);
+	SendMessage(wmPtr->wrapper, WM_SETICON, ICON_BIG, (LPARAM) hBigIcon);
     }
 
     /*
@@ -2420,7 +2416,7 @@ TkWmMapWindow(
 				 * mapped. */
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+    ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (!tsdPtr->initialized) {
@@ -2432,8 +2428,7 @@ TkWmMapWindow(
 	 * Don't map a transient if the master is not mapped.
 	 */
 
-	if (wmPtr->masterPtr != NULL &&
-		!Tk_IsMapped(wmPtr->masterPtr)) {
+	if (wmPtr->masterPtr != NULL && !Tk_IsMapped(wmPtr->masterPtr)) {
 	    wmPtr->hints.initial_state = WithdrawnState;
 	    return;
 	}
@@ -2659,6 +2654,7 @@ TkWmDeadWindow(
 	winPtr->dispPtr->firstWmPtr = wmPtr->nextPtr;
     } else {
 	register WmInfo *prevPtr;
+
 	for (prevPtr = winPtr->dispPtr->firstWmPtr; ;
 		prevPtr = prevPtr->nextPtr) {
 	    if (prevPtr == NULL) {
@@ -2681,7 +2677,7 @@ TkWmDeadWindow(
 	    wmPtr->numTransients--;
 	    Tk_DeleteEventHandler((Tk_Window) wmPtr2->masterPtr,
 		    VisibilityChangeMask|StructureNotifyMask,
-		    WmWaitVisibilityOrMapProc, (ClientData) wmPtr2->winPtr);
+		    WmWaitVisibilityOrMapProc, wmPtr2->winPtr);
 	    wmPtr2->masterPtr = NULL;
 	    if ((wmPtr2->wrapper != None)
 		    && !(wmPtr2->flags & (WM_NEVER_MAPPED))) {
@@ -2721,7 +2717,7 @@ TkWmDeadWindow(
 
 	protPtr = wmPtr->protPtr;
 	wmPtr->protPtr = protPtr->nextPtr;
-	Tcl_EventuallyFree((ClientData) protPtr, TCL_DYNAMIC);
+	Tcl_EventuallyFree(protPtr, TCL_DYNAMIC);
     }
     if (wmPtr->cmdArgv != NULL) {
 	ckfree((char *) wmPtr->cmdArgv);
@@ -2730,7 +2726,7 @@ TkWmDeadWindow(
 	ckfree((char *) wmPtr->clientMachine);
     }
     if (wmPtr->flags & WM_UPDATE_PENDING) {
-	Tcl_CancelIdleCall(UpdateGeometryInfo, (ClientData) winPtr);
+	Tcl_CancelIdleCall(UpdateGeometryInfo, winPtr);
     }
     if (wmPtr->masterPtr != NULL) {
 	wmPtr2 = wmPtr->masterPtr->wmInfoPtr;
@@ -2744,7 +2740,7 @@ TkWmDeadWindow(
 	}
 	Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
 		VisibilityChangeMask|StructureNotifyMask,
-		WmWaitVisibilityOrMapProc, (ClientData) winPtr);
+		WmWaitVisibilityOrMapProc, winPtr);
 	wmPtr->masterPtr = NULL;
     }
     if (wmPtr->crefObj != NULL) {
@@ -2833,7 +2829,7 @@ Tk_WmObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = (Tk_Window) clientData;
+    Tk_Window tkwin = clientData;
     static const char *optionStrings[] = {
 	"aspect", "attributes", "client", "colormapwindows",
 	"command", "deiconify", "focusmodel", "forget", "frame",
@@ -2847,11 +2843,13 @@ Tk_WmObjCmd(
     };
     enum options {
 	WMOPT_ASPECT, WMOPT_ATTRIBUTES, WMOPT_CLIENT, WMOPT_COLORMAPWINDOWS,
-	WMOPT_COMMAND, WMOPT_DEICONIFY, WMOPT_FOCUSMODEL, WMOPT_FORGET, WMOPT_FRAME,
+	WMOPT_COMMAND, WMOPT_DEICONIFY, WMOPT_FOCUSMODEL, WMOPT_FORGET,
+	WMOPT_FRAME,
 	WMOPT_GEOMETRY, WMOPT_GRID, WMOPT_GROUP, WMOPT_ICONBITMAP,
 	WMOPT_ICONIFY, WMOPT_ICONMASK, WMOPT_ICONNAME,
 	WMOPT_ICONPHOTO, WMOPT_ICONPOSITION,
-	WMOPT_ICONWINDOW, WMOPT_MANAGE, WMOPT_MAXSIZE, WMOPT_MINSIZE, WMOPT_OVERRIDEREDIRECT,
+	WMOPT_ICONWINDOW, WMOPT_MANAGE, WMOPT_MAXSIZE, WMOPT_MINSIZE,
+	WMOPT_OVERRIDEREDIRECT,
 	WMOPT_POSITIONFROM, WMOPT_PROTOCOL, WMOPT_RESIZABLE, WMOPT_SIZEFROM,
 	WMOPT_STACKORDER, WMOPT_STATE, WMOPT_TITLE, WMOPT_TRANSIENT,
 	WMOPT_WITHDRAW
@@ -2906,8 +2904,8 @@ Tk_WmObjCmd(
 	    != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (!Tk_IsTopLevel(winPtr) &&
-	    (index != WMOPT_MANAGE) && (index != WMOPT_FORGET)) {
+    if (!Tk_IsTopLevel(winPtr) && (index != WMOPT_MANAGE)
+	    && (index != WMOPT_FORGET)) {
 	Tcl_AppendResult(interp, "window \"", winPtr->pathName,
 		"\" isn't a top-level window", NULL);
 	return TCL_ERROR;
@@ -3221,10 +3219,11 @@ WmAttributesCmd(
 
 		/*
 		 * Only ever add the WS_EX_LAYERED bit, as it can cause
-		 * flashing to change this window style.  This allows things
+		 * flashing to change this window style. This allows things
 		 * like fading tooltips to avoid flash ugliness without
 		 * forcing all window to be layered.
 		 */
+
 		if ((wmPtr->alpha < 1.0) || (wmPtr->crefObj != NULL)) {
 		    *stylePtr |= styleBit;
 		}
@@ -3248,9 +3247,9 @@ WmAttributesCmd(
 		}
 	    }
 	} else {
-	    if ((i < objc-1) &&
-		    (Tcl_GetBooleanFromObj(interp, objv[i+1], &boolean)
-			    != TCL_OK)) {
+	    if ((i < objc-1)
+		    && Tcl_GetBooleanFromObj(interp, objv[i+1], &boolean)
+			    != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (config_fullscreen) {
@@ -3276,6 +3275,7 @@ WmAttributesCmd(
 	     * Force the topmost position aspect to ensure that switching
 	     * between (no)topmost reflects properly when rewrapped.
 	     */
+
 	    SetWindowPos(wmPtr->wrapper,
 		    ((exStyle & WS_EX_TOPMOST) ?
 			    HWND_TOPMOST : HWND_NOTOPMOST), 0, 0, 0, 0,
@@ -3384,7 +3384,7 @@ WmClientCmd(
     argv3 = Tcl_GetStringFromObj(objv[3], &length);
     if (argv3[0] == 0) {
 	if (wmPtr->clientMachine != NULL) {
-	    ckfree((char *) wmPtr->clientMachine);
+	    ckfree(wmPtr->clientMachine);
 	    wmPtr->clientMachine = NULL;
 	    if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
 		XDeleteProperty(winPtr->display, winPtr->window,
@@ -3394,11 +3394,10 @@ WmClientCmd(
 	return TCL_OK;
     }
     if (wmPtr->clientMachine != NULL) {
-	ckfree((char *) wmPtr->clientMachine);
+	ckfree(wmPtr->clientMachine);
     }
-    wmPtr->clientMachine = (char *)
-	    ckalloc((unsigned) (length + 1));
-    strcpy(wmPtr->clientMachine, argv3);
+    wmPtr->clientMachine = ckalloc((unsigned) length + 1);
+    memcpy(wmPtr->clientMachine, argv3, (unsigned) length + 1);
     if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
 	XTextProperty textProp;
 
@@ -3462,8 +3461,8 @@ WmColormapwindowsCmd(
 	    != TCL_OK) {
 	return TCL_ERROR;
     }
-    cmapList = (TkWindow **) ckalloc((unsigned)
-	    ((windowObjc+1)*sizeof(TkWindow*)));
+    cmapList = (TkWindow **)
+	    ckalloc((unsigned) (windowObjc + 1) * sizeof(TkWindow*));
     gotToplevel = 0;
     for (i = 0; i < windowObjc; i++) {
 	if (TkGetWindowFromObj(interp, tkwin, windowObjv[i],
@@ -3488,7 +3487,7 @@ WmColormapwindowsCmd(
     }
     wmPtr->flags |= WM_COLORMAPS_EXPLICIT;
     if (wmPtr->cmapList != NULL) {
-	ckfree((char *)wmPtr->cmapList);
+	ckfree((char *) wmPtr->cmapList);
     }
     wmPtr->cmapList = cmapList;
     wmPtr->cmapCount = windowObjc;
@@ -3701,7 +3700,7 @@ WmForgetCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register Tk_Window frameWin = (Tk_Window)winPtr;
+    register Tk_Window frameWin = (Tk_Window) winPtr;
 
     if (Tk_IsTopLevel(frameWin)) {
 	Tk_UnmapWindow(frameWin);
@@ -3977,8 +3976,8 @@ WmGroupCmd(
 	}
 	wmPtr->hints.window_group = Tk_WindowId(tkwin2);
 	wmPtr->hints.flags |= WindowGroupHint;
-	wmPtr->leaderName = ckalloc((unsigned) (length + 1));
-	strcpy(wmPtr->leaderName, argv3);
+	wmPtr->leaderName = ckalloc((unsigned) length + 1);
+	memcpy(wmPtr->leaderName, argv3, (unsigned) length + 1);
     }
     return TCL_OK;
 }
@@ -4274,8 +4273,8 @@ WmIconnameCmd(
 	    ckfree((char *) wmPtr->iconName);
 	}
 	argv3 = Tcl_GetStringFromObj(objv[3], &length);
-	wmPtr->iconName = ckalloc((unsigned) (length + 1));
-	strcpy(wmPtr->iconName, argv3);
+	wmPtr->iconName = ckalloc((unsigned) length + 1);
+	memcpy(wmPtr->iconName, argv3, (unsigned) length + 1);
 	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
 	    XSetIconName(winPtr->display, winPtr->window, wmPtr->iconName);
 	}
@@ -4596,7 +4595,7 @@ WmManageCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register Tk_Window frameWin = (Tk_Window)winPtr;
+    register Tk_Window frameWin = (Tk_Window) winPtr;
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (!Tk_IsTopLevel(frameWin)) {
@@ -4781,7 +4780,7 @@ WmOverrideredirectCmd(
 	    Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect,
 		    &atts);
 	    if (!(wmPtr->flags & (WM_NEVER_MAPPED))
-		&& !(winPtr->flags & TK_EMBEDDED)) {
+		    && !(winPtr->flags & TK_EMBEDDED)) {
 		UpdateWrapper(winPtr);
 	    }
 	}
@@ -4930,7 +4929,7 @@ WmProtocolCmd(
 	    } else {
 		prevPtr->nextPtr = protPtr->nextPtr;
 	    }
-	    Tcl_EventuallyFree((ClientData) protPtr, TCL_DYNAMIC);
+	    Tcl_EventuallyFree(protPtr, TCL_DYNAMIC);
 	    break;
 	}
     }
@@ -5374,7 +5373,7 @@ WmTitleCmd(
     }
 
     if(winPtr->flags & TK_EMBEDDED) {
-	wrapper = (HWND)SendMessage(wmPtr->wrapper, TK_GETFRAMEWID, 0, 0);
+	wrapper = (HWND) SendMessage(wmPtr->wrapper, TK_GETFRAMEWID, 0, 0);
     } else {
 	wrapper = wmPtr->wrapper;
     }
@@ -5384,7 +5383,7 @@ WmTitleCmd(
 	    Tcl_DString titleString;
 	    int size = tkWinProcs->useWide ? 256 : 512;
 
-	    (*tkWinProcs->getWindowText)(wrapper, (LPCTSTR)buf, size);
+	    tkWinProcs->getWindowText(wrapper, (LPCTSTR) buf, size);
 	    Tcl_WinTCharToUtf(buf, -1, &titleString);
 	    Tcl_SetResult(interp, Tcl_DStringValue(&titleString),TCL_VOLATILE);
 	    Tcl_DStringFree(&titleString);
@@ -5395,16 +5394,17 @@ WmTitleCmd(
 	}
     } else {
 	if (wmPtr->title != NULL) {
-	    ckfree((char *) wmPtr->title);
+	    ckfree(wmPtr->title);
 	}
 	argv3 = Tcl_GetStringFromObj(objv[3], &length);
-	wmPtr->title = ckalloc((unsigned) (length + 1));
-	strcpy(wmPtr->title, argv3);
+	wmPtr->title = ckalloc((unsigned) length + 1);
+	memcpy(wmPtr->title, argv3, (unsigned) length + 1);
 
 	if (!(wmPtr->flags & WM_NEVER_MAPPED) && wmPtr->wrapper != NULL) {
 	    Tcl_DString titleString;
+
 	    Tcl_WinUtfToTChar(wmPtr->title, -1, &titleString);
-	    (*tkWinProcs->setWindowText)(wrapper,
+	    tkWinProcs->setWindowText(wrapper,
 		    (LPCTSTR) Tcl_DStringValue(&titleString));
 	    Tcl_DStringFree(&titleString);
 	}
@@ -5461,7 +5461,7 @@ WmTransientCmd(
 	    masterPtr->wmInfoPtr->numTransients--;
 	    Tk_DeleteEventHandler((Tk_Window) masterPtr,
 		    VisibilityChangeMask|StructureNotifyMask,
-		    WmWaitVisibilityOrMapProc, (ClientData) winPtr);
+		    WmWaitVisibilityOrMapProc, winPtr);
 	}
 
 	wmPtr->masterPtr = NULL;
@@ -5510,21 +5510,21 @@ WmTransientCmd(
 		wmPtr->masterPtr->wmInfoPtr->numTransients--;
 		Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
 			VisibilityChangeMask|StructureNotifyMask,
-			WmWaitVisibilityOrMapProc, (ClientData) winPtr);
+			WmWaitVisibilityOrMapProc, winPtr);
 	    }
 
 	    masterPtr->wmInfoPtr->numTransients++;
 	    Tk_CreateEventHandler((Tk_Window) masterPtr,
 		    VisibilityChangeMask|StructureNotifyMask,
-		    WmWaitVisibilityOrMapProc, (ClientData) winPtr);
+		    WmWaitVisibilityOrMapProc, winPtr);
 
 	    wmPtr->masterPtr = masterPtr;
 	}
     }
     if (!((wmPtr->flags & WM_NEVER_MAPPED)
 	    && !(winPtr->flags & TK_EMBEDDED))) {
-	if (wmPtr->masterPtr != NULL &&
-		!Tk_IsMapped(wmPtr->masterPtr)) {
+	if (wmPtr->masterPtr != NULL
+		&& !Tk_IsMapped(wmPtr->masterPtr)) {
 	    TkpWmSetState(winPtr, WithdrawnState);
 	} else {
 	    UpdateWrapper(winPtr);
@@ -5594,7 +5594,7 @@ WmUpdateGeom(
     TkWindow *winPtr)
 {
     if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) {
-	Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr);
+	Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
 	wmPtr->flags |= WM_UPDATE_PENDING;
     }
 }
@@ -5605,7 +5605,7 @@ WmWaitVisibilityOrMapProc(
     ClientData clientData,	/* Pointer to window. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    TkWindow *winPtr = (TkWindow *) clientData;
+    TkWindow *winPtr = clientData;
     TkWindow *masterPtr = winPtr->wmInfoPtr->masterPtr;
 
     if (masterPtr == NULL)
@@ -5734,7 +5734,7 @@ Tk_SetGrid(
     wmPtr->heightInc = heightInc;
     wmPtr->sizeHintsFlags |= PBaseSize|PResizeInc;
     if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) {
-	Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr);
+	Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
 	wmPtr->flags |= WM_UPDATE_PENDING;
     }
 }
@@ -5794,7 +5794,7 @@ Tk_UnsetGrid(
     wmPtr->heightInc = 1;
 
     if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) {
-	Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr);
+	Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
 	wmPtr->flags |= WM_UPDATE_PENDING;
     }
 }
@@ -5822,7 +5822,7 @@ TopLevelEventProc(
     ClientData clientData,	/* Window for which event occurred. */
     XEvent *eventPtr)		/* Event that just happened. */
 {
-    register TkWindow *winPtr = (TkWindow *) clientData;
+    register TkWindow *winPtr = clientData;
 
     if (eventPtr->type == DestroyNotify) {
 	Tk_ErrorHandler handler;
@@ -5837,7 +5837,7 @@ TopLevelEventProc(
 	     */
 
 	    handler = Tk_CreateErrorHandler(winPtr->display, -1, -1, -1,
-		    (Tk_ErrorProc *) NULL, (ClientData) NULL);
+		    NULL, NULL);
 	    Tk_DestroyWindow((Tk_Window) winPtr);
 	    Tk_DeleteErrorHandler(handler);
 	}
@@ -5877,7 +5877,7 @@ TopLevelReqProc(
 		Tk_ReqHeight(tkwin));
     }
     if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) {
-	Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr);
+	Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
 	wmPtr->flags |= WM_UPDATE_PENDING;
     }
 }
@@ -5911,7 +5911,7 @@ UpdateGeometryInfo(
     int width, height;		/* Size of client area. */
     int min, max;
     RECT rect;
-    register TkWindow *winPtr = (TkWindow *) clientData;
+    register TkWindow *winPtr = clientData;
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     wmPtr->flags &= ~WM_UPDATE_PENDING;
@@ -6287,7 +6287,7 @@ ParseGeometry(
     wmPtr->flags = flags;
 
     if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) {
-	Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr);
+	Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
 	wmPtr->flags |= WM_UPDATE_PENDING;
     }
     return TCL_OK;
@@ -6482,9 +6482,9 @@ Tk_MoveToplevelWindow(
 
     if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
 	if (wmPtr->flags & WM_UPDATE_PENDING) {
-	    Tcl_CancelIdleCall(UpdateGeometryInfo, (ClientData) winPtr);
+	    Tcl_CancelIdleCall(UpdateGeometryInfo, winPtr);
 	}
-	UpdateGeometryInfo((ClientData) winPtr);
+	UpdateGeometryInfo(winPtr);
     }
 }
 
@@ -6532,9 +6532,9 @@ TkWmProtocolEventProc(
 
 	    const char *name = Tk_GetAtomName((Tk_Window) winPtr, protocol);
 
-	    Tcl_Preserve((ClientData) protPtr);
+	    Tcl_Preserve(protPtr);
 	    interp = protPtr->interp;
-	    Tcl_Preserve((ClientData) interp);
+	    Tcl_Preserve(interp);
 	    result = Tcl_GlobalEval(interp, protPtr->command);
 	    if (result != TCL_OK) {
 		Tcl_AddErrorInfo(interp, "\n    (command for \"");
@@ -6542,8 +6542,8 @@ TkWmProtocolEventProc(
 		Tcl_AddErrorInfo(interp, "\" window manager protocol)");
 		Tcl_BackgroundError(interp);
 	    }
-	    Tcl_Release((ClientData) interp);
-	    Tcl_Release((ClientData) protPtr);
+	    Tcl_Release(interp);
+	    Tcl_Release(protPtr);
 	    return;
 	}
     }
@@ -6590,7 +6590,7 @@ TkWmStackorderToplevelEnumProc(
 
     hPtr = Tcl_FindHashEntry(pair->table, (char *) hwnd);
     if (hPtr != NULL) {
-	childWinPtr = (TkWindow *) Tcl_GetHashValue(hPtr);
+	childWinPtr = Tcl_GetHashValue(hPtr);
 
 	/*
 	 * Double check that same HWND does not get passed twice.
@@ -6638,8 +6638,8 @@ TkWmStackorderToplevelWrapperMap(
     HWND wrapper;
     int newEntry;
 
-    if (Tk_IsMapped(winPtr) && Tk_IsTopLevel(winPtr) &&
-	    !Tk_IsEmbedded(winPtr) && (winPtr->display == display)) {
+    if (Tk_IsMapped(winPtr) && Tk_IsTopLevel(winPtr)
+	    && !Tk_IsEmbedded(winPtr) && (winPtr->display == display)) {
 	wrapper = TkWinGetWrapperWindow((Tk_Window) winPtr);
 
 	/*
@@ -6690,8 +6690,8 @@ TkWmStackorderToplevel(
     Tcl_InitHashTable(&table, TCL_ONE_WORD_KEYS);
     TkWmStackorderToplevelWrapperMap(parentPtr, parentPtr->display, &table);
 
-    windows = (TkWindow **) ckalloc((table.numEntries+1)
-	* sizeof(TkWindow *));
+    windows = (TkWindow **)
+	    ckalloc((table.numEntries+1) * sizeof(TkWindow *));
 
     /*
      * Special cases: If zero or one toplevels were mapped there is no need to
@@ -6704,7 +6704,7 @@ TkWmStackorderToplevel(
 	goto done;
     case 1:
 	hPtr = Tcl_FirstHashEntry(&table, &search);
-	windows[0] = (TkWindow *) Tcl_GetHashValue(hPtr);
+	windows[0] = Tcl_GetHashValue(hPtr);
 	windows[1] = NULL;
 	goto done;
     }
@@ -6790,7 +6790,7 @@ TkWmRestackToplevel(
 
     if (winPtr->flags & TK_EMBEDDED) {
 	SendMessage(winPtr->wmInfoPtr->wrapper, TK_RAISEWINDOW,
-		(WPARAM)insertAfter, aboveBelow);
+		(WPARAM) insertAfter, aboveBelow);
     } else {
 	TkWinSetWindowPos(hwnd, insertAfter, aboveBelow);
     }
@@ -6869,7 +6869,7 @@ TkWmAddToColormapWindows(
      * Automatically add the toplevel itself as the last element of the list.
      */
 
-    newPtr = (TkWindow **) ckalloc((unsigned) ((count+2)*sizeof(TkWindow*)));
+    newPtr = (TkWindow **) ckalloc((unsigned) (count+2) * sizeof(TkWindow *));
     if (count > 0) {
 	memcpy(newPtr, oldPtr, count * sizeof(TkWindow*));
     }
@@ -7011,12 +7011,12 @@ TkWinSetMenu(
     }
     if (!(winPtr->flags & TK_EMBEDDED)) {
 	if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) {
-	    Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr);
+	    Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
 	    wmPtr->flags |= WM_UPDATE_PENDING|WM_MOVE_PENDING;
 	}
     } else {
-	SendMessage(wmPtr->wrapper, TK_SETMENU,
-		(WPARAM)hMenu, (LPARAM)Tk_GetMenuHWND(tkwin));
+	SendMessage(wmPtr->wrapper, TK_SETMENU, (WPARAM) hMenu,
+		(LPARAM) Tk_GetMenuHWND(tkwin));
     }
 }
 
@@ -7096,7 +7096,7 @@ ConfigureTopLevel(
 	     */
 
 	    if (!(wmPtr->flags & WM_UPDATE_PENDING)) {
-		Tcl_DoWhenIdle(UpdateGeometryInfo, (ClientData) winPtr);
+		Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
 		wmPtr->flags |= WM_UPDATE_PENDING;
 	    }
 	    /* fall through */
@@ -7329,11 +7329,9 @@ InstallColormaps(
 	    SelectPalette(dc, oldPalette, TRUE);
 	    RealizePalette(dc);
 	    ReleaseDC(hwnd, dc);
-	    SendMessage(hwnd, WM_PALETTECHANGED, (WPARAM)hwnd,
-		    (LPARAM)NULL);
+	    SendMessage(hwnd, WM_PALETTECHANGED, (WPARAM) hwnd, (LPARAM) NULL);
 	    return TRUE;
 	}
-
     } else {
 	/*
 	 * Window is being notified of a change in the system palette. If this
@@ -7858,7 +7856,7 @@ WmProc(
 
     case WM_PALETTECHANGED:
 	result = InstallColormaps(hwnd, WM_PALETTECHANGED,
-		hwnd == (HWND)wParam);
+		hwnd == (HWND) wParam);
 	goto done;
 
     case WM_QUERYNEWPALETTE:
@@ -7898,15 +7896,15 @@ WmProc(
 
     case WM_MOUSEACTIVATE: {
 	ActivateEvent *eventPtr;
-	winPtr = GetTopLevel((HWND) wParam);
 
+	winPtr = GetTopLevel((HWND) wParam);
 	if (winPtr && (TkGrabState(winPtr) != TK_GRAB_EXCLUDED)) {
 	    /*
 	     * This allows us to pass the message onto the native menus [Bug:
 	     * 2272]
 	     */
 
-	    result = (*tkWinProcs->defWindowProc)(hwnd, message,
+	    result = tkWinProcs->defWindowProc(hwnd, message,
 		    wParam, lParam);
 	    goto done;
 	}
@@ -7918,10 +7916,10 @@ WmProc(
 	 */
 
 	if (winPtr) {
-	    eventPtr = (ActivateEvent *)ckalloc(sizeof(ActivateEvent));
+	    eventPtr = (ActivateEvent *) ckalloc(sizeof(ActivateEvent));
 	    eventPtr->ev.proc = ActivateWindow;
 	    eventPtr->winPtr = winPtr;
-	    Tcl_QueueEvent((Tcl_Event*)eventPtr, TCL_QUEUE_TAIL);
+	    Tcl_QueueEvent((Tcl_Event *) eventPtr, TCL_QUEUE_TAIL);
 	}
 	result = MA_NOACTIVATE;
 	goto done;
@@ -7958,7 +7956,7 @@ WmProc(
     case WM_MENUSELECT:
     case WM_ENTERIDLE:
     case WM_INITMENUPOPUP: {
-	HWND hMenuHWnd = Tk_GetEmbeddedMenuHWND((Tk_Window)winPtr);
+	HWND hMenuHWnd = Tk_GetEmbeddedMenuHWND((Tk_Window) winPtr);
 
 	if (hMenuHWnd) {
 	    if (SendMessage(hMenuHWnd, message, wParam, lParam)) {
@@ -7980,11 +7978,10 @@ WmProc(
 	    result = 0;
 	} else if (!Tk_TranslateWinEvent(child, message, wParam, lParam,
 		&result)) {
-	    result = (*tkWinProcs->defWindowProc)(hwnd, message,
-		    wParam, lParam);
+	    result = tkWinProcs->defWindowProc(hwnd, message, wParam, lParam);
 	}
     } else {
-	result = (*tkWinProcs->defWindowProc)(hwnd, message, wParam, lParam);
+	result = tkWinProcs->defWindowProc(hwnd, message, wParam, lParam);
     }
 
   done:
@@ -8030,8 +8027,8 @@ TkpMakeMenuWindow(
 
     if ((atts.override_redirect != Tk_Attributes(tkwin)->override_redirect)
 	    || (atts.save_under != Tk_Attributes(tkwin)->save_under)) {
-	Tk_ChangeWindowAttributes(tkwin,
-		CWOverrideRedirect|CWSaveUnder, &atts);
+	Tk_ChangeWindowAttributes(tkwin, CWOverrideRedirect|CWSaveUnder,
+		&atts);
     }
 
 }
@@ -8056,8 +8053,9 @@ HWND
 TkWinGetWrapperWindow(
     Tk_Window tkwin)		/* The window we need the wrapper from */
 {
-    TkWindow *winPtr = (TkWindow *)tkwin;
-    return (winPtr->wmInfoPtr->wrapper);
+    TkWindow *winPtr = (TkWindow *) tkwin;
+
+    return winPtr->wmInfoPtr->wrapper;
 }
 
 /*
@@ -8219,6 +8217,7 @@ TkpWinToplevelWithDraw(
     TkWindow *winPtr)
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
+
     wmPtr->flags |= WM_WITHDRAWN;
     TkpWmSetState(winPtr, WithdrawnState);
 }
@@ -8278,10 +8277,10 @@ TkpWinToplevelDeiconify(
      * deiconified by TkpWmSetState. Don't bother if we've never been mapped.
      */
 
-    if ((wmPtr->flags & WM_UPDATE_PENDING) &&
-	    !(wmPtr->flags & WM_NEVER_MAPPED)) {
-	Tcl_CancelIdleCall(UpdateGeometryInfo, (ClientData) winPtr);
-	UpdateGeometryInfo((ClientData) winPtr);
+    if ((wmPtr->flags & WM_UPDATE_PENDING)
+	    && !(wmPtr->flags & WM_NEVER_MAPPED)) {
+	Tcl_CancelIdleCall(UpdateGeometryInfo, winPtr);
+	UpdateGeometryInfo(winPtr);
     }
 
     /*
@@ -8338,11 +8337,10 @@ TkpWinToplevelIsControlledByWm(
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
 
-    if (wmPtr) {
-	return ((wmPtr->width != -1) && (wmPtr->height != -1))? 1:0;
-    } else {
+    if (!wmPtr) {
 	return 0;
     }
+    return ((wmPtr->width != -1) && (wmPtr->height != -1)) ? 1 : 0;
 }
 
 /*
@@ -8370,7 +8368,7 @@ TkpWinToplevelMove(
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (wmPtr && x >= 0 && y >= 0 && !TkpWinToplevelIsControlledByWm(winPtr)) {
-	Tk_MoveToplevelWindow((Tk_Window)winPtr, x, y);
+	Tk_MoveToplevelWindow((Tk_Window) winPtr, x, y);
     }
     return ((winPtr->changes.x << 16) & 0xffff0000)
 	    | (winPtr->changes.y & 0xffff);
@@ -8402,7 +8400,9 @@ TkpWinToplevelOverrideRedirect(
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     curValue = Tk_Attributes((Tk_Window) winPtr)->override_redirect;
-    if(reqValue < 0) return curValue;
+    if (reqValue < 0) {
+	return curValue;
+    }
 
     if (curValue != reqValue) {
 	XSetWindowAttributes atts;
@@ -8468,8 +8468,7 @@ TkpWinToplevelDetachWindow(
  *
  * RemapWindows
  *
- *	Adjust parent/child relation ships of
- *	the given window hierarchy.
+ *	Adjust parent/child relation ships of the given window hierarchy.
  *
  * Results:
  *	none
@@ -8481,13 +8480,16 @@ TkpWinToplevelDetachWindow(
  */
 
 static void 
-RemapWindows(winPtr, parentHWND)
-     TkWindow *winPtr;
-     HWND parentHWND;
+RemapWindows(
+    TkWindow *winPtr,
+    HWND parentHWND)
 {
     TkWindow *childPtr;
 
-    /* Skip Menus as they are handled differently */
+    /*
+     * Skip menus as they are handled differently.
+     */
+
     if (strcmp(Tk_Class(winPtr), "Menu") == 0) {
 	return;
     }
@@ -8495,9 +8497,12 @@ RemapWindows(winPtr, parentHWND)
 	SetParent(Tk_GetHWND(winPtr->window), parentHWND);
     }
 
-    /* Repeat for all the children */
+    /*
+     * Repeat for all the children.
+     */
+
     for (childPtr = winPtr->childList; childPtr != NULL;
-	 childPtr = childPtr->nextPtr) {
+	    childPtr = childPtr->nextPtr) {
 	RemapWindows(childPtr,
 		winPtr->window ? Tk_GetHWND(winPtr->window) : NULL);
     }