mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 23:30:48 +00:00
revert accidental commit
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29544 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
cc03266a4c
commit
d1ecd0f9e2
1 changed files with 3 additions and 8 deletions
|
@ -1481,10 +1481,8 @@ many times.
|
||||||
|
|
||||||
- (void) becomeMainWindow
|
- (void) becomeMainWindow
|
||||||
{
|
{
|
||||||
|
|
||||||
if (_f.is_main == NO)
|
if (_f.is_main == NO)
|
||||||
{
|
{
|
||||||
NSLog(@"become main %@ %d",[self title], _f.is_main);
|
|
||||||
_f.is_main = YES;
|
_f.is_main = YES;
|
||||||
if (_f.is_key == NO)
|
if (_f.is_key == NO)
|
||||||
{
|
{
|
||||||
|
@ -1595,12 +1593,10 @@ many times.
|
||||||
|
|
||||||
- (void) makeMainWindow
|
- (void) makeMainWindow
|
||||||
{
|
{
|
||||||
NSLog(@"make main %@ %d %d %d",[self title], _f.visible, _f.is_miniaturized, _f.is_main);
|
|
||||||
if (!_f.visible || _f.is_miniaturized || _f.is_main == YES)
|
if (!_f.visible || _f.is_miniaturized || _f.is_main == YES)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (![self canBecomeMainWindow])
|
if (![self canBecomeMainWindow])
|
||||||
return;
|
return;
|
||||||
[[NSApp mainWindow] resignMainWindow];
|
[[NSApp mainWindow] resignMainWindow];
|
||||||
|
@ -1806,8 +1802,6 @@ many times.
|
||||||
{
|
{
|
||||||
if (_f.is_main == YES)
|
if (_f.is_main == YES)
|
||||||
{
|
{
|
||||||
NSLog(@"resign main %@ %d",[self title], _f.is_main);
|
|
||||||
|
|
||||||
_f.is_main = NO;
|
_f.is_main = NO;
|
||||||
if (_f.is_key == YES)
|
if (_f.is_key == YES)
|
||||||
{
|
{
|
||||||
|
@ -3849,7 +3843,7 @@ resetCursorRectsForView(NSView *theView)
|
||||||
int action;
|
int action;
|
||||||
NSEvent *e;
|
NSEvent *e;
|
||||||
GSAppKitSubtype sub = [theEvent subtype];
|
GSAppKitSubtype sub = [theEvent subtype];
|
||||||
|
|
||||||
switch (sub)
|
switch (sub)
|
||||||
{
|
{
|
||||||
case GSAppKitWindowMoved:
|
case GSAppKitWindowMoved:
|
||||||
|
@ -3977,7 +3971,6 @@ resetCursorRectsForView(NSView *theView)
|
||||||
/* We should really find another window that can become
|
/* We should really find another window that can become
|
||||||
key (if possible)
|
key (if possible)
|
||||||
*/
|
*/
|
||||||
NSLog(@"Hey, I focus the main menu window");
|
|
||||||
[self _lossOfKeyOrMainWindow];
|
[self _lossOfKeyOrMainWindow];
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -3986,8 +3979,10 @@ resetCursorRectsForView(NSView *theView)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GSAppKitWindowLeave:
|
case GSAppKitWindowLeave:
|
||||||
|
/* we ignore this event for a window that is already closed */
|
||||||
if (_f.has_closed == YES);
|
if (_f.has_closed == YES);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We need to go through all of the views, and if there
|
* We need to go through all of the views, and if there
|
||||||
* is any with a tracking rectangle then we need to
|
* is any with a tracking rectangle then we need to
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue