Merge from 0.7.0

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10329 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2001-07-09 02:49:03 +00:00
parent caedf71059
commit 234c006585
27 changed files with 794 additions and 478 deletions

View file

@ -565,8 +565,11 @@ static NSMapTable* windowmaps = NULL;
if (_gstate)
DPSundefineuserobject(context, _gstate);
DPStermwindow(context, _windowNum);
NSMapRemove(windowmaps, (void*)_windowNum);
if (_windowNum)
{
DPStermwindow(context, _windowNum);
NSMapRemove(windowmaps, (void*)_windowNum);
}
[super dealloc];
}
@ -1896,6 +1899,11 @@ resetCursorRectsForView(NSView *theView)
object: self];
_f.is_miniaturized = YES;
/* Make sure we're not defered */
if(_windowNum == 0)
{
[self _initBackendWindow: _frame];
}
/*
* Ensure that we have a miniwindow counterpart.
*/
@ -2012,7 +2020,8 @@ resetCursorRectsForView(NSView *theView)
{
[NSApp updateWindowsItem: self];
}
DPSdocedited(GSCurrentContext(), flag, _windowNum);
if (_windowNum)
DPSdocedited(GSCurrentContext(), flag, _windowNum);
}
}
@ -3239,6 +3248,9 @@ resetCursorRectsForView(NSView *theView)
{
ASSIGN(_defaultButtonCell, aButtonCell);
_f.default_button_cell_key_disabled = NO;
[aButtonCell setKeyEquivalent: @"\r"];
[aButtonCell setKeyEquivalentModifierMask: 0];
}
- (void) disableKeyEquivalentForDefaultButtonCell