gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 18:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into NSBrowser_bindings_branch

Browse source
This commit is contained in:
Gregory John Casamento 2024-10-08 12:52:35 -04:00
commit 417a33de27
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Headers/AppKit/NSMenu.h
View file

@ -410,7 +410,7 @@ APPKIT_EXPORT_CLASS
unsigned int unused: 25;
} _menu;
@private
@protected
NSWindow *_aWindow;
NSWindow *_bWindow;
NSMenu *_oldAttachedMenu;

8
Source/GSCodingFlags.h
View file

@ -42,7 +42,7 @@ typedef struct _GSCellFlags {
unsigned int disabled:1;
unsigned int editable:1;
NSCellType type:2;
unsigned int type:2;
unsigned int vCentered:1;
unsigned int hCentered:1;
@ -57,7 +57,7 @@ typedef struct _GSCellFlags {
unsigned int invalidObjectValue:1;
unsigned int invalidFont:1;
NSLineBreakMode lineBreakMode:3;
unsigned int lineBreakMode:3;
unsigned int weakTargetHelperFlag:1;
unsigned int allowsAppearanceEffects:1;
@ -84,7 +84,7 @@ typedef struct _GSCellFlags {
unsigned int singleLineMode:1;
unsigned int allowsAppearanceEffects:1;
unsigned int weakTargetHelperFlag:1;
NSLineBreakMode lineBreakMode:3;
unsigned int lineBreakMode:3;
unsigned int invalidFont:1;
unsigned int invalidObjectValue:1;
unsigned int isLeaf:1;
@ -96,7 +96,7 @@ typedef struct _GSCellFlags {
unsigned int bordered:1;
unsigned int hCentered:1;
unsigned int vCentered:1;
NSCellType type:2;
unsigned int type:2;
unsigned int editable:1;
unsigned int disabled:1;
unsigned int highlighted:1;

3
Source/NSOutlineView.m
View file

@ -2195,7 +2195,6 @@ Also returns the child index relative to this parent. */
if (theBinding != nil)
{
id observedObject = [theBinding observedObject];
NSTreeController *tc = (NSTreeController *)observedObject;
NSArray *children = nil;
/* If there is a binding present, then allow it to be editable
@ -2210,6 +2209,8 @@ Also returns the child index relative to this parent. */
*/
if ([observedObject isKindOfClass: [NSTreeController class]])
{
NSTreeController *tc = (NSTreeController *)observedObject;
if (startitem == nil)
{
NSTreeNode *node = (NSTreeNode *)[theBinding destinationValue];

5
Source/NSSliderCell.m
View file

@ -658,6 +658,11 @@ double _doubleValueForMousePoint (NSPoint point, NSRect knobRect,
}
}
- (NSInteger) integerValue
{
return (NSInteger)_value;
}
- (id) objectValue
{
return [NSNumber numberWithDouble: _value];