diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 15:23:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 15:23:16 (GMT) |
| commit | 97a31b80b8c9dd4d9a19984a9b709af0265d4c43 (patch) | |
| tree | fcea170d4a9247efb33059020fe52f2c61643194 /win/tkWinWm.c | |
| parent | 473ed169135beac6352af2c5f61cca5d404ccf51 (diff) | |
| parent | c1d2b9d95856fe913236eec23533b0bd522726d3 (diff) | |
| download | tk-97a31b80b8c9dd4d9a19984a9b709af0265d4c43.zip tk-97a31b80b8c9dd4d9a19984a9b709af0265d4c43.tar.gz tk-97a31b80b8c9dd4d9a19984a9b709af0265d4c43.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 217cc57..83ff7d0 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -867,21 +867,21 @@ InitWindowClass( if (!initialized) { Tcl_MutexLock(&winWmMutex); if (!initialized) { - WNDCLASSW class; + WNDCLASSW windowClass; initialized = 1; - ZeroMemory(&class, sizeof(WNDCLASSW)); + ZeroMemory(&windowClass, sizeof(WNDCLASSW)); - class.style = CS_HREDRAW | CS_VREDRAW; - class.hInstance = Tk_GetHINSTANCE(); - class.lpszClassName = TK_WIN_TOPLEVEL_CLASS_NAME; - class.lpfnWndProc = WmProc; + windowClass.style = CS_HREDRAW | CS_VREDRAW; + windowClass.hInstance = Tk_GetHINSTANCE(); + windowClass.lpszClassName = TK_WIN_TOPLEVEL_CLASS_NAME; + windowClass.lpfnWndProc = WmProc; if (titlebaricon == NULL) { - class.hIcon = LoadIconW(Tk_GetHINSTANCE(), L"tk"); + windowClass.hIcon = LoadIconW(Tk_GetHINSTANCE(), L"tk"); } else { - class.hIcon = GetIcon(titlebaricon, ICON_BIG); - if (class.hIcon == NULL) { + windowClass.hIcon = GetIcon(titlebaricon, ICON_BIG); + if (windowClass.hIcon == NULL) { return TCL_ERROR; } @@ -892,9 +892,9 @@ InitWindowClass( tsdPtr->iconPtr = titlebaricon; } - class.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + windowClass.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); - if (!RegisterClassW(&class)) { + if (!RegisterClassW(&windowClass)) { Tcl_Panic("Unable to register TkTopLevel class"); } } |