diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-09 16:00:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-09 16:00:57 (GMT) |
| commit | e6d7a4631e02be9d89cfc48b7a29c8a041086c36 (patch) | |
| tree | b54ab372f6806bb84ccf3441144789641d350abf /win/tkWinDialog.c | |
| parent | 7b507ce5d4879deb3479ee07dc39e2f7b9bb86c2 (diff) | |
| parent | 2b48aa9710925f84b5ffac8a3682df9e3a7994ed (diff) | |
| download | tk-e6d7a4631e02be9d89cfc48b7a29c8a041086c36.zip tk-e6d7a4631e02be9d89cfc48b7a29c8a041086c36.tar.gz tk-e6d7a4631e02be9d89cfc48b7a29c8a041086c36.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/tkWinDialog.c')
| -rw-r--r-- | win/tkWinDialog.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index e81c469..9f53396 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -633,16 +633,17 @@ static void LoadShellProcs(void) { static HMODULE shell32_handle = NULL; - if (shell32_handle != NULL) - return; /* We have already been through here. */ + if (shell32_handle != NULL) { + return; /* We have already been through here. */ + } shell32_handle = GetModuleHandleW(L"shell32.dll"); - if (shell32_handle == NULL) /* Should never happen but check anyways. */ - return; + if (shell32_handle == NULL) { /* Should never happen but check anyways. */ + return; + } - ShellProcs.SHCreateItemFromParsingName = - (SHCreateItemFromParsingNameProc*) GetProcAddress(shell32_handle, - "SHCreateItemFromParsingName"); + ShellProcs.SHCreateItemFromParsingName = (SHCreateItemFromParsingNameProc*) + (void *)GetProcAddress(shell32_handle, "SHCreateItemFromParsingName"); } @@ -788,7 +789,7 @@ Tk_ChooseColorObjCmd( chooseColor.lpCustColors = dwCustColors; chooseColor.Flags = CC_RGBINIT | CC_FULLOPEN | CC_ENABLEHOOK; chooseColor.lCustData = (LPARAM) NULL; - chooseColor.lpfnHook = (LPOFNHOOKPROC) ColorDlgHookProc; + chooseColor.lpfnHook = (LPOFNHOOKPROC)(void *)ColorDlgHookProc; chooseColor.lpTemplateName = (LPWSTR) interp; for (i = 1; i < objc; i += 2) { @@ -1602,7 +1603,7 @@ static int GetFileNameXP(Tcl_Interp *interp, OFNOpts *optsPtr, enum OFNOper oper ofn.nMaxFile = TK_MULTI_MAX_PATH; ofn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_NOCHANGEDIR | OFN_EXPLORER| OFN_ENABLEHOOK| OFN_ENABLESIZING; - ofn.lpfnHook = (LPOFNHOOKPROC) OFNHookProc; + ofn.lpfnHook = (LPOFNHOOKPROC)(void *)OFNHookProc; ofn.lCustData = (LPARAM) &ofnData; if (oper != OFN_FILE_SAVE) { |