comparison src/dialog-msw.c @ 4834:b3ea9c582280

Use new cygwin_conv_path API with Cygwin 1.7 for converting names between Win32 and POSIX, UTF-8-aware, with attendant changes elsewhere
author Ben Wing <ben@xemacs.org>
date Tue, 12 Jan 2010 01:38:04 -0600
parents 1e7cc382eb16
children 95c4ced5c07c
comparison
equal deleted inserted replaced
4833:4dd2389173fc 4834:b3ea9c582280
392 bi.pidlRoot = 0; 392 bi.pidlRoot = 0;
393 bi.ulFlags = 393 bi.ulFlags =
394 BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_EDITBOX | BIF_NEWDIALOGSTYLE; 394 BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_EDITBOX | BIF_NEWDIALOGSTYLE;
395 bi.lpfn = handle_directory_proc; 395 bi.lpfn = handle_directory_proc;
396 396
397 LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil), 397 LISP_LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil),
398 pd.fname); 398 pd.fname);
399 399
400 { 400 {
401 EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) 401 EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys)
402 { 402 {
404 { 404 {
405 CHECK_STRING (value); 405 CHECK_STRING (value);
406 LISP_STRING_TO_EXTERNAL (value, bi.lpszTitle, Qmswindows_tstr); 406 LISP_STRING_TO_EXTERNAL (value, bi.lpszTitle, Qmswindows_tstr);
407 } 407 }
408 else if (EQ (key, Q_initial_directory)) 408 else if (EQ (key, Q_initial_directory))
409 LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil), 409 LISP_LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil),
410 pd.fname); 410 pd.fname);
411 else if (EQ (key, Q_initial_filename)) 411 else if (EQ (key, Q_initial_filename))
412 ; /* do nothing */ 412 ; /* do nothing */
413 else if (EQ (key, Q_file_must_exist)) 413 else if (EQ (key, Q_file_must_exist))
414 { 414 {
466 ofn.hwndOwner = FRAME_MSWINDOWS_HANDLE (f); 466 ofn.hwndOwner = FRAME_MSWINDOWS_HANDLE (f);
467 ofn.lpstrFile = (XELPTSTR) fnbuf; 467 ofn.lpstrFile = (XELPTSTR) fnbuf;
468 ofn.nMaxFile = sizeof (fnbuf) / XETCHAR_SIZE; 468 ofn.nMaxFile = sizeof (fnbuf) / XETCHAR_SIZE;
469 qxetcscpy (fnbuf, XETEXT ("")); 469 qxetcscpy (fnbuf, XETEXT (""));
470 470
471 LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil), 471 LISP_LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil),
472 ofn.lpstrInitialDir); 472 ofn.lpstrInitialDir);
473 473
474 { 474 {
475 EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) 475 EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys)
476 { 476 {
477 if (EQ (key, Q_initial_filename)) 477 if (EQ (key, Q_initial_filename))
478 { 478 {
479 Extbyte *fnout; 479 Extbyte *fnout;
480 480
481 CHECK_STRING (value); 481 CHECK_STRING (value);
482 LOCAL_FILE_FORMAT_TO_TSTR (value, fnout); 482 LISP_LOCAL_FILE_FORMAT_TO_TSTR (value, fnout);
483 qxetcscpy (fnbuf, fnout); 483 qxetcscpy (fnbuf, fnout);
484 } 484 }
485 else if (EQ (key, Q_title)) 485 else if (EQ (key, Q_title))
486 { 486 {
487 CHECK_STRING (value); 487 CHECK_STRING (value);
488 LISP_STRING_TO_TSTR (value, ofn.lpstrTitle); 488 LISP_STRING_TO_TSTR (value, ofn.lpstrTitle);
489 } 489 }
490 else if (EQ (key, Q_initial_directory)) 490 else if (EQ (key, Q_initial_directory))
491 LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil), 491 LISP_LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil),
492 ofn.lpstrInitialDir); 492 ofn.lpstrInitialDir);
493 else if (EQ (key, Q_file_must_exist)) 493 else if (EQ (key, Q_file_must_exist))
494 { 494 {
495 if (!NILP (value)) 495 if (!NILP (value))
496 ofn.Flags |= OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; 496 ofn.Flags |= OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST;