wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1097354 - Silence "adding an unknown subview" warning by calling _addKnownSubview. r=smichaud

Browse Source
This commit is contained in:
Markus Stange 2014-11-18 11:36:07 -05:00
parent 9ca2282de6
commit 08f988597b
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
widget/cocoa/nsCocoaWindow.mm
View File

@ -2579,6 +2579,13 @@ static NSMutableSet *gSwizzledFrameViewClasses = nil;
- (void)_setNeedsDisplayInRect:(NSRect)aRect;
@end
// This method is on NSThemeFrame starting with 10.10, but since NSThemeFrame
// is not a public class, we declare the method on NSView instead. We only have
// this declaration in order to avoid compiler warnings.
@interface NSView(PrivateAddKnownSubviewMethod)
- (void)_addKnownSubview:(id)arg1 positioned:(long long)arg2 relativeTo:(id)arg3;
@end
@interface BaseWindow(Private)
- (void)removeTrackingArea;
- (void)cursorUpdated:(NSEvent*)aEvent;
@ -2947,7 +2954,13 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
// to be under the window buttons.
NSView* frameView = [aView superview];
[aView removeFromSuperview];
[frameView addSubview:aView positioned:NSWindowBelow relativeTo:nil];
if ([frameView respondsToSelector:@selector(_addKnownSubview:positioned:relativeTo:)]) {
// 10.10 prints a warning when we call addSubview on the frame view, so we
// silence the warning by calling a private method instead.
[frameView _addKnownSubview:aView positioned:NSWindowBelow relativeTo:nil];
} else {
[frameView addSubview:aView positioned:NSWindowBelow relativeTo:nil];
}
}
- (NSArray*)titlebarControls