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

Merge Source/NSImageView.m Source/NSInputManager.m Source/NSLayoutManager.m

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38730 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-07-01 19:32:05 +00:00
parent d867a44374
commit 2a41972a78
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/NSInputManager.m
View file

@ -45,6 +45,8 @@ static struct
NSString *name;
unichar character;
}
// Testplant-MAL-2015-06-30: Removed main branch constant definition...
character_table[] =
{
/* Function keys. */
@ -131,6 +133,8 @@ character_table[] =
{ @"CarriageReturn", NSCarriageReturnCharacter },
{ @"Escape", 0x1b }
};
// Testplant-MAL-2015-06-30: This replaces main branch constant definition...
static int CHARACTER_TABLE_SIZE = (sizeof(character_table) / sizeof(character_table[0]));
static NSInputManager *currentInputManager = nil;
@ -675,6 +679,7 @@ static NSInputManager *currentInputManager = nil;
case NSEnterCharacter:
case NSFormFeedCharacter:
case NSCarriageReturnCharacter:
// Testplant-MAL-2015-06-30: Included from testplant branch...
if (flags & NSAlternateKeyMask)
{
[self doCommandBySelector: @selector (insertNewlineIgnoringFieldEditor:)];