diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-26 09:54:30 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-26 09:54:30 (GMT) |
| commit | bec97ed790b1d1c8f421559940d617550f33bfe6 (patch) | |
| tree | 1ffbf0565e83832059fcd428379b181b82e8c4fe /win/tkWinDialog.c | |
| parent | ddca581879e618a1a516cd2b8d33df202b998826 (diff) | |
| parent | 1fd2103759f02f4952626ef39bc5af6ea5449583 (diff) | |
| download | tk-bec97ed790b1d1c8f421559940d617550f33bfe6.zip tk-bec97ed790b1d1c8f421559940d617550f33bfe6.tar.gz tk-bec97ed790b1d1c8f421559940d617550f33bfe6.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/tkWinDialog.c')
| -rw-r--r-- | win/tkWinDialog.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index d2267d8..07997e2 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -726,7 +726,7 @@ Tk_ChooseColorObjCmd( } parent = tkwin; - chooseColor.lStructSize = sizeof(CHOOSECOLOR); + chooseColor.lStructSize = sizeof(CHOOSECOLORW); chooseColor.hwndOwner = NULL; chooseColor.hInstance = NULL; chooseColor.rgbResult = oldColor; @@ -852,7 +852,7 @@ ColorDlgHookProc( ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); const char *title; - CHOOSECOLOR *ccPtr; + CHOOSECOLORW *ccPtr; (void)wParam; if (WM_INITDIALOG == uMsg) { @@ -861,7 +861,7 @@ ColorDlgHookProc( * Set the title string of the dialog. */ - ccPtr = (CHOOSECOLOR *) lParam; + ccPtr = (CHOOSECOLORW *) lParam; title = (const char *) ccPtr->lCustData; if ((title != NULL) && (title[0] != '\0')) { @@ -3091,7 +3091,7 @@ HookProc( WPARAM wParam, LPARAM lParam) { - CHOOSEFONT *pcf = (CHOOSEFONT *) lParam; + CHOOSEFONTW *pcf = (CHOOSEFONTW *) lParam; HWND hwndCtrl; static HookData *phd = NULL; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) @@ -3403,10 +3403,10 @@ FontchooserShowCmd( Tk_MakeWindowExist(parent); - ZeroMemory(&cf, sizeof(CHOOSEFONT)); - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&cf, sizeof(CHOOSEFONTW)); + ZeroMemory(&lf, sizeof(LOGFONTW)); lf.lfCharSet = DEFAULT_CHARSET; - cf.lStructSize = sizeof(CHOOSEFONT); + cf.lStructSize = sizeof(CHOOSEFONTW); cf.hwndOwner = Tk_GetHWND(Tk_WindowId(parent)); cf.lpLogFont = &lf; cf.nFontType = SCREEN_FONTTYPE; |