ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Tk 8.6.12

Browse Source
This commit is contained in:
Steve Dower
2021-11-08 17:28:57 +00:00
parent 070b8750b0
commit c6710de848
290 changed files with 5626 additions and 3660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
win/tkWinDialog.c
View File

@@ -782,7 +782,7 @@ Tk_ChooseColorObjCmd(
}
parent = tkwin;
chooseColor.lStructSize = sizeof(CHOOSECOLOR);
chooseColor.lStructSize = sizeof(CHOOSECOLORW);
chooseColor.hwndOwner = NULL;
chooseColor.hInstance = NULL;
chooseColor.rgbResult = oldColor;
@@ -908,7 +908,7 @@ ColorDlgHookProc(
ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
const char *title;
CHOOSECOLOR *ccPtr;
CHOOSECOLORW *ccPtr;
(void)wParam;
if (WM_INITDIALOG == uMsg) {
@@ -917,7 +917,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')) {
@@ -3151,7 +3151,7 @@ HookProc(
WPARAM wParam,
LPARAM lParam)
{
CHOOSEFONT *pcf = (CHOOSEFONT *) lParam;
CHOOSEFONTW *pcf = (CHOOSEFONTW *) lParam;
HWND hwndCtrl;
static HookData *phd = NULL;
ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
@@ -3463,10 +3463,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;