Merge 8.6. Missing cast in Tcl_WinTCharToUtf() macro (when compiling without -DUNICODE)

1 files changed, 8 insertions, 8 deletions

diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index dba7a31..8dc0d7c 100644
--- a/win/tclWinNotify.c
+++ b/win/tclWinNotify.c
@@ -98,7 +98,7 @@ Tcl_InitNotifier(void)
 
 	EnterCriticalSection(&notifierMutex);
 	if (notifierCount == 0) {
-	    WNDCLASS clazz;
+	    WNDCLASSW clazz;
 
 	    clazz.style = 0;
 	    clazz.cbClsExtra = 0;
@@ -111,7 +111,7 @@ Tcl_InitNotifier(void)
 	    clazz.hIcon = NULL;
 	    clazz.hCursor = NULL;
 
-	    if (!RegisterClass(&clazz)) {
+	    if (!RegisterClassW(&clazz)) {
 		Tcl_Panic("Unable to register TclNotifier window class");
 	    }
 	}
@@ -195,7 +195,7 @@ Tcl_FinalizeNotifier(
 	if (notifierCount) {
 	    notifierCount--;
 	    if (notifierCount == 0) {
-		UnregisterClass(className, TclWinGetTclInstance());
+		UnregisterClassW(className, TclWinGetTclInstance());
 	    }
 	}
 	LeaveCriticalSection(&notifierMutex);
@@ -359,7 +359,7 @@ Tcl_ServiceModeHook(
 	 */
 
 	if (mode == TCL_SERVICE_ALL && !tsdPtr->hwnd) {
-	    tsdPtr->hwnd = CreateWindow(className, className,
+	    tsdPtr->hwnd = CreateWindowW(className, className,
 		    WS_TILED, 0, 0, 0, 0, NULL, NULL, TclWinGetTclInstance(),
 		    NULL);
 
@@ -479,7 +479,7 @@ Tcl_WaitForEvent(
 	 * events currently sitting in the queue.
 	 */
 
-	if (!PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
+	if (!PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE)) {
 	    /*
 	     * Wait for something to happen (a signal from another thread, a
 	     * message, or timeout) or loop servicing asynchronous procedure
@@ -501,12 +501,12 @@ Tcl_WaitForEvent(
 	 * Check to see if there are any messages to process.
 	 */
 
-	if (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
+	if (PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE)) {
 	    /*
 	     * Retrieve and dispatch the first message.
 	     */
 
-	    result = GetMessage(&msg, NULL, 0, 0);
+	    result = GetMessageW(&msg, NULL, 0, 0);
 	    if (result == 0) {
 		/*
 		 * We received a request to exit this thread (WM_QUIT), so
@@ -524,7 +524,7 @@ Tcl_WaitForEvent(
 		status = -1;
 	    } else {
 		TranslateMessage(&msg);
-		DispatchMessage(&msg);
+		DispatchMessageW(&msg);
 		status = 1;
 	    }
 	} else {