summaryrefslogtreecommitdiff
path: root/src/nsterm.h
diff options
context:
space:
mode:
authorAlan Third <alan@idiocy.org>2021-08-22 21:50:09 +0100
committerAlan Third <alan@idiocy.org>2021-12-22 20:48:19 +0000
commit42601d3a938ee5a12a557840aef11c4d3bb180f6 (patch)
treef1cf9617fafff0e7550baa7c083d197ce81b8b23 /src/nsterm.h
parent308ad05d37a2d230c65a8799e193e25f4f8ba540 (diff)
downloademacs-42601d3a938ee5a12a557840aef11c4d3bb180f6.tar.gz
Make NS toolbar use NSString instead of C strings
* src/nsfns.m ([NSString stringWithLispString:]): Ensure that the lisp object is actually a string. * src/nsmenu.m (update_frame_tool_bar): Convert to NSString instead of C strings. ([EmacsToolbar addDisplayItemWithImage:idx:tag:labelText:helpText:enabled:]): No need to convert to NSString here anymore.
Diffstat (limited to 'src/nsterm.h')
-rw-r--r--src/nsterm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsterm.h b/src/nsterm.h
index 3413bb1f780..75b31c68f1d 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -551,8 +551,8 @@ typedef id instancetype;
- (void) addDisplayItemWithImage: (EmacsImage *)img
idx: (int)idx
tag: (int)tag
- labelText: (const char *)label
- helpText: (const char *)help
+ labelText: (NSString *)label
+ helpText: (NSString *)help
enabled: (BOOL)enabled;
/* delegate methods */