gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 07:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge some code with main brnch revision 39289

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@39326 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-02-01 22:08:22 +00:00
parent 3e5185efa1
commit ffb26b5d34
14 changed files with 738 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Source/NSWindow.m
View file

@ -3284,50 +3284,10 @@ checkCursorRectanglesExited(NSView *theView, NSEvent *theEvent, NSPoint lastPoi
+ (NSButton *) standardWindowButton: (NSWindowButton)button
forStyleMask: (NSUInteger) mask
{
NSButton *newButton;
newButton = [[NSButton alloc] init];
[newButton setRefusesFirstResponder: YES];
[newButton setButtonType: NSMomentaryChangeButton];
[newButton setImagePosition: NSImageOnly];
[newButton setBordered: YES];
[newButton setTag: button];
switch (button)
{
case NSWindowCloseButton:
[newButton setImage: [NSImage imageNamed: @"common_Close"]];
[newButton setAlternateImage: [NSImage imageNamed: @"common_CloseH"]];
/* TODO: -performClose: should (but doesn't currently) highlight the
button, which is wrong here. When -performClose: is fixed, we'll need a
different method here. */
[newButton setAction: @selector(performClose:)];
break;
case NSWindowMiniaturizeButton:
[newButton setImage: [NSImage imageNamed: @"common_Miniaturize"]];
[newButton setAlternateImage: [NSImage imageNamed: @"common_MiniaturizeH"]];
[newButton setAction: @selector(miniaturize:)];
break;
case NSWindowZoomButton:
// FIXME
[newButton setAction: @selector(zoom:)];
break;
case NSWindowToolbarButton:
// FIXME
[newButton setAction: @selector(toggleToolbarShown:)];
break;
case NSWindowDocumentIconButton:
default:
// FIXME
break;
return [[GSTheme theme] standardWindowButton: button
forStyleMask: mask];
}
return AUTORELEASE(newButton);
}
- (NSButton *) standardWindowButton: (NSWindowButton)button
{
return [_wv viewWithTag: button];
@ -5285,6 +5245,7 @@ current key view.<br />
[aCell setKeyEquivalent: @"\r"];
[aCell setKeyEquivalentModifierMask: 0];
[[GSTheme theme] didSetDefaultButtonCell: aCell];
}
- (void) disableKeyEquivalentForDefaultButtonCell