diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-23 18:50:49 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-23 18:50:49 (GMT) |
commit | 797299a238c72e1add2fd56d9706346a46861e0a (patch) | |
tree | 9a780e02f8f65645a03c60dc8cfe266e73e001f8 /win/tkWinWm.c | |
parent | cd10234e38f770e0ccb89282180716b4cbd04fea (diff) | |
download | tk-797299a238c72e1add2fd56d9706346a46861e0a.zip tk-797299a238c72e1add2fd56d9706346a46861e0a.tar.gz tk-797299a238c72e1add2fd56d9706346a46861e0a.tar.bz2 |
Use more explicit *W()-forms of the Win32 API, instead of relying on -DUNICODE
Diffstat (limited to 'win/tkWinWm.c')
-rw-r--r-- | win/tkWinWm.c | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 167b8ea..8b3e449 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -1013,15 +1013,15 @@ WinSetIcon( /* * Don't check return result of SetClassLong() or - * SetClassLongPtr() since they return the previously set value + * SetClassLongPtrW() since they return the previously set value * which is zero on the initial call or in an error case. The MSDN * documentation does not indicate that the result needs to be * checked. */ - SetClassLongPtr(hwnd, GCLP_HICONSM, + SetClassLongPtrW(hwnd, GCLP_HICONSM, (LPARAM) GetIcon(titlebaricon, ICON_SMALL)); - SetClassLongPtr(hwnd, GCLP_HICON, + SetClassLongPtrW(hwnd, GCLP_HICON, (LPARAM) GetIcon(titlebaricon, ICON_BIG)); tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); @@ -1066,9 +1066,9 @@ WinSetIcon( return TCL_ERROR; } } - SendMessage(hwnd, WM_SETICON, ICON_SMALL, + SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM) GetIcon(titlebaricon, ICON_SMALL)); - SendMessage(hwnd, WM_SETICON, ICON_BIG, + SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM) GetIcon(titlebaricon, ICON_BIG)); /* @@ -1157,10 +1157,10 @@ TkWinGetIcon( * the window class. */ - icon = (HICON) SendMessage(wmPtr->wrapper, WM_GETICON, iconsize, + icon = (HICON) SendMessageW(wmPtr->wrapper, WM_GETICON, iconsize, (LPARAM) NULL); if (icon == (HICON) NULL) { - icon = (HICON) GetClassLongPtr(wmPtr->wrapper, + icon = (HICON) GetClassLongPtrW(wmPtr->wrapper, (iconsize == ICON_BIG) ? GCLP_HICON : GCLP_HICONSM); } return icon; @@ -1744,7 +1744,7 @@ GetTopLevel( if (tsdPtr->createWindow) { return tsdPtr->createWindow; } - return (TkWindow *) GetWindowLongPtr(hwnd, GWLP_USERDATA); + return (TkWindow *) GetWindowLongPtrW(hwnd, GWLP_USERDATA); } /* @@ -2130,7 +2130,7 @@ UpdateWrapper( wmPtr->style, x, y, width, height, parentHWND, NULL, Tk_GetHINSTANCE(), NULL); Tcl_DStringFree(&titleString); - SetWindowLongPtr(wmPtr->wrapper, GWLP_USERDATA, (LONG_PTR) winPtr); + SetWindowLongPtrW(wmPtr->wrapper, GWLP_USERDATA, (LONG_PTR) winPtr); tsdPtr->createWindow = NULL; if (wmPtr->exStyleConfig & WS_EX_LAYERED) { @@ -2181,24 +2181,24 @@ UpdateWrapper( * doesn't try to set the focus to the child window. */ - SetWindowLongPtr(child, GWL_STYLE, + SetWindowLongPtrW(child, GWL_STYLE, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS); if (winPtr->flags & TK_EMBEDDED) { - SetWindowLongPtr(child, GWLP_WNDPROC, (LONG_PTR) TopLevelProc); + SetWindowLongPtrW(child, GWLP_WNDPROC, (LONG_PTR) TopLevelProc); } SetParent(child, wmPtr->wrapper); if (oldWrapper) { hSmallIcon = (HICON) - SendMessage(oldWrapper, WM_GETICON, ICON_SMALL, (LPARAM)NULL); + SendMessageW(oldWrapper, WM_GETICON, ICON_SMALL, (LPARAM)NULL); hBigIcon = (HICON) - SendMessage(oldWrapper, WM_GETICON, ICON_BIG, (LPARAM) NULL); + SendMessageW(oldWrapper, WM_GETICON, ICON_BIG, (LPARAM) NULL); } if (oldWrapper && (oldWrapper != wmPtr->wrapper) && (oldWrapper != GetDesktopWindow())) { - SetWindowLongPtr(oldWrapper, GWLP_USERDATA, (LONG_PTR) 0); + SetWindowLongPtrW(oldWrapper, GWLP_USERDATA, (LONG_PTR) 0); if (wmPtr->numTransients > 0) { /* @@ -2231,11 +2231,11 @@ UpdateWrapper( wmPtr->flags &= ~WM_NEVER_MAPPED; if (winPtr->flags & TK_EMBEDDED && - SendMessage(wmPtr->wrapper, TK_ATTACHWINDOW, (WPARAM) child, 0)) { - SendMessage(wmPtr->wrapper, TK_GEOMETRYREQ, + SendMessageW(wmPtr->wrapper, TK_ATTACHWINDOW, (WPARAM) child, 0)) { + SendMessageW(wmPtr->wrapper, TK_GEOMETRYREQ, Tk_ReqWidth((Tk_Window) winPtr), Tk_ReqHeight((Tk_Window) winPtr)); - SendMessage(wmPtr->wrapper, TK_SETMENU, (WPARAM) wmPtr->hMenu, + SendMessageW(wmPtr->wrapper, TK_SETMENU, (WPARAM) wmPtr->hMenu, (LPARAM) Tk_GetMenuHWND((Tk_Window) winPtr)); } @@ -2255,11 +2255,11 @@ UpdateWrapper( wmPtr->hints.initial_state = state; if (hSmallIcon != NULL) { - SendMessage(wmPtr->wrapper, WM_SETICON, ICON_SMALL, + SendMessageW(wmPtr->wrapper, WM_SETICON, ICON_SMALL, (LPARAM) hSmallIcon); } if (hBigIcon != NULL) { - SendMessage(wmPtr->wrapper, WM_SETICON, ICON_BIG, (LPARAM) hBigIcon); + SendMessageW(wmPtr->wrapper, WM_SETICON, ICON_BIG, (LPARAM) hBigIcon); } /* @@ -2271,7 +2271,7 @@ UpdateWrapper( */ if (winPtr->flags & TK_EMBEDDED) { - if (state+1 != SendMessage(wmPtr->wrapper, TK_STATE, state, 0)) { + if (state+1 != SendMessageW(wmPtr->wrapper, TK_STATE, state, 0)) { TkpWmSetState(winPtr, NormalState); wmPtr->hints.initial_state = NormalState; } @@ -2701,7 +2701,7 @@ TkWmDeadWindow( } } else { if (wmPtr->wrapper != NULL) { - SendMessage(wmPtr->wrapper, TK_DETACHWINDOW, 0, 0); + SendMessageW(wmPtr->wrapper, TK_DETACHWINDOW, 0, 0); } } if (wmPtr->iconPtr != NULL) { @@ -3188,7 +3188,7 @@ WmAttributesCmd( */ if (!(wmPtr->exStyleConfig & WS_EX_LAYERED)) { - SetWindowLongPtr(wmPtr->wrapper, GWL_EXSTYLE, + SetWindowLongPtrW(wmPtr->wrapper, GWL_EXSTYLE, *stylePtr); } SetLayeredWindowAttributes((HWND) wmPtr->wrapper, @@ -3567,7 +3567,7 @@ WmDeiconifyCmd( return TCL_ERROR; } if (winPtr->flags & TK_EMBEDDED) { - if (!SendMessage(wmPtr->wrapper, TK_DEICONIFY, 0, 0)) { + if (!SendMessageW(wmPtr->wrapper, TK_DEICONIFY, 0, 0)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't deiconify %s: the container does not support the request", winPtr->pathName)); @@ -3775,7 +3775,7 @@ WmGeometryCmd( height = winPtr->changes.height; } if (winPtr->flags & TK_EMBEDDED) { - int result = SendMessage(wmPtr->wrapper, TK_MOVEWINDOW, -1, -1); + int result = SendMessageW(wmPtr->wrapper, TK_MOVEWINDOW, -1, -1); wmPtr->x = result >> 16; wmPtr->y = result & 0x0000ffff; @@ -4124,7 +4124,7 @@ WmIconifyCmd( return TCL_ERROR; } if (winPtr->flags & TK_EMBEDDED) { - if (!SendMessage(wmPtr->wrapper, TK_ICONIFY, 0, 0)) { + if (!SendMessageW(wmPtr->wrapper, TK_ICONIFY, 0, 0)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't iconify %s: the container does not support the request", winPtr->pathName)); @@ -4817,7 +4817,7 @@ WmOverrideredirectCmd( return TCL_ERROR; } if (winPtr->flags & TK_EMBEDDED) { - curValue = SendMessage(wmPtr->wrapper, TK_OVERRIDEREDIRECT, -1, -1)-1; + curValue = SendMessageW(wmPtr->wrapper, TK_OVERRIDEREDIRECT, -1, -1)-1; if (curValue < 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "Container does not support overrideredirect", -1)); @@ -4836,7 +4836,7 @@ WmOverrideredirectCmd( } if (curValue != boolean) { if (winPtr->flags & TK_EMBEDDED) { - SendMessage(wmPtr->wrapper, TK_OVERRIDEREDIRECT, boolean, 0); + SendMessageW(wmPtr->wrapper, TK_OVERRIDEREDIRECT, boolean, 0); } else { /* * Only do this if we are really changing value, because it causes @@ -5350,7 +5350,7 @@ WmStateCmd( Tcl_Panic("unexpected index"); } - if (state+1 != SendMessage(wmPtr->wrapper, TK_STATE, state, 0)) { + if (state+1 != SendMessageW(wmPtr->wrapper, TK_STATE, state, 0)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't change state of %s: the container does not support the request", winPtr->pathName)); @@ -5403,7 +5403,7 @@ WmStateCmd( int state; if (winPtr->flags & TK_EMBEDDED) { - state = SendMessage(wmPtr->wrapper, TK_STATE, -1, -1) - 1; + state = SendMessageW(wmPtr->wrapper, TK_STATE, -1, -1) - 1; } else { state = wmPtr->hints.initial_state; } @@ -5455,7 +5455,7 @@ WmTitleCmd( } if (winPtr->flags & TK_EMBEDDED) { - wrapper = (HWND) SendMessage(wmPtr->wrapper, TK_GETFRAMEWID, 0, 0); + wrapper = (HWND) SendMessageW(wmPtr->wrapper, TK_GETFRAMEWID, 0, 0); } else { wrapper = wmPtr->wrapper; } @@ -5663,7 +5663,7 @@ WmWithdrawCmd( } if (winPtr->flags & TK_EMBEDDED) { - if (SendMessage(wmPtr->wrapper, TK_WITHDRAW, 0, 0) < 0) { + if (SendMessageW(wmPtr->wrapper, TK_WITHDRAW, 0, 0) < 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't withdraw %s: the container does not support the request", Tcl_GetString(objv[2]))); @@ -5968,7 +5968,7 @@ TopLevelReqProc( wmPtr = winPtr->wmInfoPtr; if (wmPtr) { if ((winPtr->flags & TK_EMBEDDED) && (wmPtr->wrapper != NULL)) { - SendMessage(wmPtr->wrapper, TK_GEOMETRYREQ, Tk_ReqWidth(tkwin), + SendMessageW(wmPtr->wrapper, TK_GEOMETRYREQ, Tk_ReqWidth(tkwin), Tk_ReqHeight(tkwin)); } if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) { @@ -6180,8 +6180,8 @@ UpdateGeometryInfo( * be ignored. */ - SendMessage(wmPtr->wrapper, TK_MOVEWINDOW, x, y); - SendMessage(wmPtr->wrapper, TK_GEOMETRYREQ, width, height); + SendMessageW(wmPtr->wrapper, TK_MOVEWINDOW, x, y); + SendMessageW(wmPtr->wrapper, TK_GEOMETRYREQ, width, height); } else { int reqHeight, reqWidth; RECT windowRect; @@ -6876,7 +6876,7 @@ TkWmRestackToplevel( } if (winPtr->flags & TK_EMBEDDED) { - SendMessage(winPtr->wmInfoPtr->wrapper, TK_RAISEWINDOW, + SendMessageW(winPtr->wmInfoPtr->wrapper, TK_RAISEWINDOW, (WPARAM) insertAfter, aboveBelow); } else { TkWinSetWindowPos(hwnd, insertAfter, aboveBelow); @@ -7102,7 +7102,7 @@ TkWinSetMenu( wmPtr->flags |= WM_UPDATE_PENDING|WM_MOVE_PENDING; } } else { - SendMessage(wmPtr->wrapper, TK_SETMENU, (WPARAM) hMenu, + SendMessageW(wmPtr->wrapper, TK_SETMENU, (WPARAM) hMenu, (LPARAM) Tk_GetMenuHWND(tkwin)); } } @@ -7416,7 +7416,7 @@ InstallColormaps( SelectPalette(dc, oldPalette, TRUE); RealizePalette(dc); ReleaseDC(hwnd, dc); - SendMessage(hwnd, WM_PALETTECHANGED, (WPARAM) hwnd, (LPARAM) NULL); + SendMessageW(hwnd, WM_PALETTECHANGED, (WPARAM) hwnd, (LPARAM) NULL); return TRUE; } } else { @@ -7812,7 +7812,7 @@ TopLevelProc( winPtr->changes.height = pos->cy; } if (!(pos->flags & SWP_NOMOVE)) { - long result = SendMessage(winPtr->wmInfoPtr->wrapper, + long result = SendMessageW(winPtr->wmInfoPtr->wrapper, TK_MOVEWINDOW, -1, -1); winPtr->wmInfoPtr->x = winPtr->changes.x = result >> 16; winPtr->wmInfoPtr->y = winPtr->changes.y = result & 0xffff; @@ -8003,7 +8003,7 @@ WmProc( * 2272] */ - result = DefWindowProc(hwnd, message, wParam, lParam); + result = DefWindowProcW(hwnd, message, wParam, lParam); goto done; } @@ -8080,7 +8080,7 @@ WmProc( HWND hMenuHWnd = Tk_GetEmbeddedMenuHWND((Tk_Window) winPtr); if (hMenuHWnd) { - if (SendMessage(hMenuHWnd, message, wParam, lParam)) { + if (SendMessageW(hMenuHWnd, message, wParam, lParam)) { goto done; } } else if (TkWinHandleMenuEvent(&hwnd, &message, &wParam, &lParam, @@ -8099,10 +8099,10 @@ WmProc( result = 0; } else if (!Tk_TranslateWinEvent(child, message, wParam, lParam, &result)) { - result = DefWindowProc(hwnd, message, wParam, lParam); + result = DefWindowProcW(hwnd, message, wParam, lParam); } } else { - result = DefWindowProc(hwnd, message, wParam, lParam); + result = DefWindowProcW(hwnd, message, wParam, lParam); } done: @@ -8616,10 +8616,10 @@ TkpWinToplevelDetachWindow( register WmInfo *wmPtr = winPtr->wmInfoPtr; if (winPtr->flags & TK_EMBEDDED) { - int state = SendMessage(wmPtr->wrapper, TK_STATE, -1, -1) - 1; + int state = SendMessageW(wmPtr->wrapper, TK_STATE, -1, -1) - 1; - SendMessage(wmPtr->wrapper, TK_SETMENU, 0, 0); - SendMessage(wmPtr->wrapper, TK_DETACHWINDOW, 0, 0); + SendMessageW(wmPtr->wrapper, TK_SETMENU, 0, 0); + SendMessageW(wmPtr->wrapper, TK_DETACHWINDOW, 0, 0); winPtr->flags &= ~TK_EMBEDDED; winPtr->privatePtr = NULL; wmPtr->wrapper = NULL; |