Merge with trunk revision 40072

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40131 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-10-05 21:18:43 +00:00
parent fd11511309
commit ab97ddee5f
9 changed files with 12 additions and 21 deletions

View file

@ -45,8 +45,6 @@ static struct
NSString *name;
unichar character;
}
// Testplant-MAL-2015-06-30: Removed main branch constant definition...
character_table[] =
{
/* Function keys. */
@ -134,7 +132,6 @@ character_table[] =
{ @"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;
@ -679,7 +676,6 @@ 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:)];