diff options
| author | YAMAMOTO Mitsuharu <[email protected]> | 2005-04-14 09:25:41 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <[email protected]> | 2005-04-14 09:25:41 +0000 |
| commit | 844631fa1fd1a0c3f8d53c8afd5541a684008665 (patch) | |
| tree | 80a9507d615a6e0997faf76c83ab1293a994ef19 /src/macfns.c | |
| parent | 42c6741e0a3bede0ed18626ae2e66b4f2a8bb37e (diff) | |
(x_set_name, x_set_title) [!TARGET_API_MAC_CARBON]: Use ENCODE_SYSTEM
to encode title bar string.
(x_create_tip_frame): Apply 2005-03-18 change for xfns.c.
(Fx_file_dialog) [TARGET_API_MAC_CARBON && !MAC_OSX]: Use
CFStringGetSystemEncoding to get system default string encoding.
Diffstat (limited to 'src/macfns.c')
| -rw-r--r-- | src/macfns.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/macfns.c b/src/macfns.c index 357f993b0f..970014e096 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -1895,7 +1895,7 @@ x_set_name (f, name, explicit) #if TARGET_API_MAC_CARBON name = ENCODE_UTF_8 (name); #else - return; + name = ENCODE_SYSTEM (name); #endif BLOCK_INPUT; @@ -1977,7 +1977,7 @@ x_set_title (f, name, old_name) #if TARGET_API_MAC_CARBON name = ENCODE_UTF_8 (name); #else - return; + name = ENCODE_SYSTEM (name); #endif BLOCK_INPUT; @@ -3637,9 +3637,6 @@ x_create_tip_frame (dpyinfo, parms, text) check_mac (); - /* Use this general default value to start with until we know if - this frame has a specified name. */ - Vx_resource_name = Vinvocation_name; #ifdef MULTI_KBOARD kb = dpyinfo->kboard; @@ -3653,7 +3650,6 @@ x_create_tip_frame (dpyinfo, parms, text) && !EQ (name, Qunbound) && !NILP (name)) error ("Invalid frame name--not a string or nil"); - Vx_resource_name = name; frame = Qnil; GCPRO3 (parms, name, frame); @@ -4362,7 +4358,12 @@ If ONLY-DIR-P is non-nil, the user can only select directories. */) filename[len++] = '/'; CFStringGetCString(reply.saveFileName, filename+len, sizeof (filename) - len, - kCFStringEncodingUTF8); +#if MAC_OSX + kCFStringEncodingUTF8 +#else + CFStringGetSystemEncoding () +#endif + ); } file = DECODE_FILE (make_unibyte_string (filename, strlen (filename))); |