Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | correct -DUNICODE handling for tk_chooseColor dialog |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
360b160020db0fc2102bd58010368442 |
| User & Date: | jan.nijtmans 2011-10-10 11:51:28 |
Context
|
2011-10-11
| ||
| 09:11 | code cleanup (WCHAR -> TCHAR, no direct calls to *W() functions, unnecessary type casts check-in: 43378935 user: jan.nijtmans tags: trunk | |
|
2011-10-10
| ||
| 11:51 | correct -DUNICODE handling for tk_chooseColor dialog check-in: 360b1600 user: jan.nijtmans tags: trunk | |
| 11:31 | [BUG 3163893] -initialdir option bug for tk_chooseDirectory under XP check-in: 201af9ec user: jan.nijtmans tags: trunk | |
Changes
Changes to win/tkWinDialog.c.
| ︙ | ︙ | |||
307 308 309 310 311 312 313 |
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
Tk_Window tkwin = clientData, parent;
HWND hWnd;
int i, oldMode, winCode, result;
| | | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 |
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
Tk_Window tkwin = clientData, parent;
HWND hWnd;
int i, oldMode, winCode, result;
CHOOSECOLOR chooseColor;
static int inited = 0;
static COLORREF dwCustColors[16];
static long oldColor; /* the color selected last time */
static const char *const optionStrings[] = {
"-initialcolor", "-parent", "-title", NULL
};
enum options {
|
| ︙ | ︙ | |||
343 344 345 346 347 348 349 |
chooseColor.hwndOwner = NULL;
chooseColor.hInstance = NULL;
chooseColor.rgbResult = oldColor;
chooseColor.lpCustColors = dwCustColors;
chooseColor.Flags = CC_RGBINIT | CC_FULLOPEN | CC_ENABLEHOOK;
chooseColor.lCustData = (LPARAM) NULL;
chooseColor.lpfnHook = (LPOFNHOOKPROC) ColorDlgHookProc;
| | | 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 |
chooseColor.hwndOwner = NULL;
chooseColor.hInstance = NULL;
chooseColor.rgbResult = oldColor;
chooseColor.lpCustColors = dwCustColors;
chooseColor.Flags = CC_RGBINIT | CC_FULLOPEN | CC_ENABLEHOOK;
chooseColor.lCustData = (LPARAM) NULL;
chooseColor.lpfnHook = (LPOFNHOOKPROC) ColorDlgHookProc;
chooseColor.lpTemplateName = (LPTSTR) interp;
for (i = 1; i < objc; i += 2) {
int index;
const char *string;
Tcl_Obj *optionPtr, *valuePtr;
optionPtr = objv[i];
|
| ︙ | ︙ | |||
395 396 397 398 399 400 401 |
Tk_MakeWindowExist(parent);
chooseColor.hwndOwner = NULL;
hWnd = Tk_GetHWND(Tk_WindowId(parent));
chooseColor.hwndOwner = hWnd;
oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
| | | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 |
Tk_MakeWindowExist(parent);
chooseColor.hwndOwner = NULL;
hWnd = Tk_GetHWND(Tk_WindowId(parent));
chooseColor.hwndOwner = hWnd;
oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
winCode = ChooseColor(&chooseColor);
(void) Tcl_SetServiceMode(oldMode);
/*
* Ensure that hWnd is enabled, because it can happen that we have updated
* the wrapper of the parent, which causes us to leave this child disabled
* (Windows loses sync).
*/
|
| ︙ | ︙ |