diff options
Diffstat (limited to 'cocoa/PlatCocoa.mm')
| -rw-r--r-- | cocoa/PlatCocoa.mm | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 9b73b3dcf..71c078bab 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -483,8 +483,8 @@ void SurfaceImpl::FillColour(const ColourDesired &back) {  //-------------------------------------------------------------------------------------------------- -CGImageRef SurfaceImpl::GetImage() { -	// For now, assume that GetImage can only be called on PixMap surfaces. +CGImageRef SurfaceImpl::CreateImage() { +	// For now, assume that CreateImage can only be called on PixMap surfaces.  	if (!bitmapData)  		return NULL; @@ -655,7 +655,7 @@ void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) {  	SurfaceImpl &patternSurface = static_cast<SurfaceImpl &>(surfacePattern);  	// For now, assume that copy can only be called on PixMap surfaces. Shows up black. -	CGImageRef image = patternSurface.GetImage(); +	CGImageRef image = patternSurface.CreateImage();  	if (image == NULL) {  		FillRectangle(rc, ColourDesired(0));  		return; @@ -970,7 +970,7 @@ void SurfaceImpl::Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back)  void SurfaceImpl::CopyImageRectangle(Surface &surfaceSource, PRectangle srcRect, PRectangle dstRect) {  	SurfaceImpl &source = static_cast<SurfaceImpl &>(surfaceSource); -	CGImageRef image = source.GetImage(); +	CGImageRef image = source.CreateImage();  	CGRect src = PRectangleToCGRect(srcRect);  	CGRect dst = PRectangleToCGRect(dstRect); @@ -1002,7 +1002,7 @@ void SurfaceImpl::Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSou  	SurfaceImpl &source = static_cast<SurfaceImpl &>(surfaceSource);  	// Get the CGImageRef -	CGImageRef image = source.GetImage(); +	CGImageRef image = source.CreateImage();  	// If we could not get an image reference, fill the rectangle black  	if (image == NULL) {  		FillRectangle(rc, ColourDesired(0)); @@ -1471,7 +1471,7 @@ static NSImage *ImageFromXPM(XPM *pxpm) {  		SurfaceImpl *surfaceIXPM = static_cast<SurfaceImpl *>(surfaceXPM.get());  		CGContextClearRect(surfaceIXPM->GetContext(), CGRectMake(0, 0, width, height));  		pxpm->Draw(surfaceXPM.get(), rcxpm); -		CGImageRef imageRef = surfaceIXPM->GetImage(); +		CGImageRef imageRef = surfaceIXPM->CreateImage();  		img = [[NSImage alloc] initWithCGImage: imageRef size: NSZeroSize];  		CGImageRelease(imageRef);  	}  | 
