aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/PlatCocoa.mm
diff options
context:
space:
mode:
authornyamatongwe <nyamatongwe@gmail.com>2013-01-30 11:19:56 +1100
committernyamatongwe <nyamatongwe@gmail.com>2013-01-30 11:19:56 +1100
commit241a606303ea56321dcd975beca3e49bb5f1ca1f (patch)
tree0739055d7a37bd8683698a2ff3424f7610d88970 /cocoa/PlatCocoa.mm
parentb6b784c701a33c9ba11330a5fb1ecdc745abdb04 (diff)
downloadscintilla-mirror-241a606303ea56321dcd975beca3e49bb5f1ca1f.tar.gz
Type casts so will build in std=c++11 mode.
Diffstat (limited to 'cocoa/PlatCocoa.mm')
-rw-r--r--cocoa/PlatCocoa.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index a3d5ac17b..901ce4f7d 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -1793,7 +1793,7 @@ void ListBoxImpl::RegisterImage(int type, const char* xpm_data)
void ListBoxImpl::RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) {
CGImageRef imageRef = ImageCreateFromRGBA(width, height, pixelsImage, false);
- NSSize sz = {width, height};
+ NSSize sz = {static_cast<CGFloat>(width), static_cast<CGFloat>(height)};
NSImage *img = [[[NSImage alloc] initWithSize: sz] autorelease];
NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage: imageRef];
[img addRepresentation: bitmapRep];