Merge pull request matplotlib#23558 from greglucas/macosx-utf8-strings

jklymak · web-flow · commit 29a86636a9c4 · 2022-08-04T20:52:21.000-07:00
MNT: Use UTF-8 string in macosx backend
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -716,10 +716,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
     if (!PyArg_ParseTuple(args, "s", &title)) {
         return NULL;
     }
-    NSString* ns_title = [[NSString alloc]
-                          initWithCString: title
-                          encoding: NSUTF8StringEncoding];
-    [self->window setTitle: ns_title];
+    [self->window setTitle: [NSString stringWithUTF8String: title]];
     Py_RETURN_NONE;
 }
 
@@ -946,10 +943,8 @@ -(void)save_figure:(id)sender { gil_call_method(toolbar, "save_figure"); }
     rect.origin.y = 0.5*(height - rect.size.height);
 
     for (int i = 0; i < 7; i++) {
-        NSString* filename = [NSString stringWithCString: images[i]
-                                                encoding: NSUTF8StringEncoding];
-        NSString* tooltip = [NSString stringWithCString: tooltips[i]
-                                               encoding: NSUTF8StringEncoding];
+        NSString* filename = [NSString stringWithUTF8String: images[i]];
+        NSString* tooltip = [NSString stringWithUTF8String: tooltips[i]];
         NSImage* image = [[NSImage alloc] initWithContentsOfFile: filename];
         buttons[i] = [[NSButton alloc] initWithFrame: rect];
         [image setSize: size];
