mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 20:01:11 +00:00
Merge with trunk revision 40072
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40124 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn
parent
c950044cfc
commit
28fb936763
5 changed files with 54 additions and 8 deletions
|
|
@ -9,7 +9,7 @@
|
|||
Date: 1996
|
||||
Author: Felipe A. Rodriguez <far@ix.netcom.com>
|
||||
Date: July 1998
|
||||
Author: Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
|
||||
Author: Daniel Bšhringer <boehring@biomed.ruhr-uni-bochum.de>
|
||||
Date: August 1998
|
||||
Author: Nicola Pero <n.pero@mi.flashnet.it>
|
||||
Date: December 2000
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
Copyright (C) 1996 Free Software Foundation, Inc.
|
||||
|
||||
Author: Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
|
||||
Author: Daniel Bšhringer <boehring@biomed.ruhr-uni-bochum.de>
|
||||
Date: August 1998
|
||||
Source by Daniel Böhringer integrated into GNUstep gui
|
||||
Source by Daniel Bšhringer integrated into GNUstep gui
|
||||
by Felipe A. Rodriguez <far@ix.netcom.com>
|
||||
|
||||
This file is part of the GNUstep GUI Library.
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
|
||||
Copyright (C) 1996,1999 Free Software Foundation, Inc.
|
||||
|
||||
Author: Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
|
||||
Author: Daniel Bšhringer <boehring@biomed.ruhr-uni-bochum.de>
|
||||
Date: August 1998
|
||||
Source by Daniel Böhringer integrated into GNUstep gui
|
||||
Source by Daniel Bšhringer integrated into GNUstep gui
|
||||
by Felipe A. Rodriguez <far@ix.netcom.com>
|
||||
Update: Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
|
|
|
|||
|
|
@ -101,10 +101,39 @@ enum {
|
|||
NSUnscaledWindowMask = 2048,
|
||||
NSUnifiedTitleAndToolbarWindowMask = 4096,
|
||||
#endif
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_7, GS_API_LATEST)
|
||||
NSFullScreenWindowMask = 16384,
|
||||
#endif
|
||||
NSIconWindowMask = 64, /* GNUstep extension - app icon window */
|
||||
NSMiniWindowMask = 128 /* GNUstep extension - miniwindows */
|
||||
};
|
||||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
|
||||
enum {
|
||||
NSWindowCollectionBehaviorDefault = 0,
|
||||
NSWindowCollectionBehaviorCanJoinAllSpaces = 1 << 0,
|
||||
NSWindowCollectionBehaviorMoveToActiveSpace = 1 << 1
|
||||
};
|
||||
#endif
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
|
||||
enum {
|
||||
NSWindowCollectionBehaviorManaged = 1 << 2,
|
||||
NSWindowCollectionBehaviorTransient = 1 << 3,
|
||||
NSWindowCollectionBehaviorStationary = 1 << 4,
|
||||
};
|
||||
enum {
|
||||
NSWindowCollectionBehaviorParticipatesInCycle = 1 << 5,
|
||||
NSWindowCollectionBehaviorIgnoresCycle = 1 << 6
|
||||
};
|
||||
#endif
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_7, GS_API_LATEST)
|
||||
enum {
|
||||
NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
|
||||
NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8
|
||||
};
|
||||
#endif
|
||||
typedef NSUInteger NSWindowCollectionBehavior;
|
||||
|
||||
enum _NSSelectionDirection {
|
||||
NSDirectSelection,
|
||||
NSSelectingNext,
|
||||
|
|
@ -541,6 +570,11 @@ PACKAGE_SCOPE
|
|||
|
||||
- (NSResponder*) firstResponder;
|
||||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
|
||||
- (NSWindowCollectionBehavior)collectionBehavior;
|
||||
- (void)setCollectionBehavior:(NSWindowCollectionBehavior)props;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* This method attempts to make aResponder the first responder.<br />
|
||||
* If aResponder is already the first responder, this method has no
|
||||
|
|
@ -738,7 +772,7 @@ PACKAGE_SCOPE
|
|||
#endif
|
||||
|
||||
/*
|
||||
* Window butons
|
||||
* Window buttons
|
||||
*/
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_2, GS_API_LATEST)
|
||||
+ (NSButton *) standardWindowButton: (NSWindowButton)button
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<abstract>The window class</abstract>
|
||||
|
||||
Copyright (C) 1996 Free Software Foundation, Inc.
|
||||
Copyright (C) 1996-2015 Free Software Foundation, Inc.
|
||||
|
||||
Author: Scott Christley <scottc@net-community.com>
|
||||
Venkat Ajjanagadde <venkat@ocbi.com>
|
||||
|
|
@ -2707,6 +2707,18 @@ titleWithRepresentedFilename(NSString *representedFilename)
|
|||
_f.dynamic_depth_limit = flag;
|
||||
}
|
||||
|
||||
- (NSWindowCollectionBehavior)collectionBehavior
|
||||
{
|
||||
//TODO: we don't handle collections yet and perhaps never will fully
|
||||
return 0;
|
||||
}
|
||||
|
||||
- (void)setCollectionBehavior:(NSWindowCollectionBehavior)props
|
||||
{
|
||||
//TODO we don't handle collections yet. Perhaps certain features can be mapped on existing ones
|
||||
//other features are Expose specific or anyway probably not implementable
|
||||
}
|
||||
|
||||
/*
|
||||
* Cursor management
|
||||
*/
|
||||
|
|
@ -4903,7 +4915,7 @@ current key view.<br />
|
|||
sRect.size.height = value;
|
||||
|
||||
// Testplant-MAL-2015-07-08: keeping testplant branch code...
|
||||
#if defined(__MINGW__)
|
||||
#if defined(_WIN32)
|
||||
// Finally, this is for handling possible frame errors due to MSWindows sending
|
||||
// x/y frame position of -32000/32893 on a minimize. These are now ignored in the
|
||||
// backend but since they were stored before, if the application was quit with
|
||||
|
|
|
|||
Loading…
Reference in a new issue