Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-23 07:46:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove [FLViewLayer dealloc] method.

Browse Source 
The Apple doc recommends not to release resources in an object's dealloc method.
The job is now done in the [FLWindow close] method.
This commit is contained in:
ManoloFLTK
2019-01-04 17:06:10 +01:00
parent 2575e7ef6b
commit 38b8dfaaea
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+7 -5
View File
@@ -597,7 +597,6 @@ void Fl_Cocoa_Screen_Driver::breakMacEventLoop()
- (void)prepare_bitmap_for_layer;
- (void)viewFrameDidChange;
- (BOOL)wantsLayer;
- (void)dealloc;
- (BOOL)did_view_resolution_change;
- (void)drawRect:(NSRect)rect;
@end
@@ -610,6 +609,13 @@ void Fl_Cocoa_Screen_Driver::breakMacEventLoop()
// when a fullscreen window is closed, windowDidResize may be sent after the close message was sent
// and before the FLWindow receives the final dealloc message
w = NULL;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
if ([[self contentView] isMemberOfClass:[FLViewLayer class]]) {
FLViewLayer *view = (FLViewLayer*)[self contentView];
CGContextRelease(view->layer_data);
view->layer_data = NULL;
}
#endif
}
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
- (NSPoint)convertBaseToScreen:(NSPoint)aPoint
@@ -2302,10 +2308,6 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
CGContextRelease(layer_data);
layer_data = NULL;
}
-(void)dealloc {
CGContextRelease(layer_data);
[super dealloc];
}
- (void)drawRect:(NSRect)rect {} // necessary under 10.14.2 to support gl_start()
@end
#endif //>= MAC_OS_X_VERSION_10_8