gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 08:30:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSParagraphStyle.m (+defaultParagraphStyle): Comment

Browse source 
out
  tabs in default paragraph style as Apple doesn't seem to have
them.
* Source/GSNibLoading.m: Set the main menu already when
  instantiating the top level objects. Thi is needed for newer
  versions of NIB files.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38160 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2014-11-04 21:22:26 +00:00
parent ef6d4ff0dc
commit 47dc548684
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2014-11-04 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSParagraphStyle.m (+defaultParagraphStyle): Comment out
tabs in default paragraph style as Apple doesn't seem to have them.
* Source/GSNibLoading.m: Set the main menu already when
instantiating the top level objects. Thi is needed for newer
versions of NIB files.
2014-10-31 Fred Kiefer <FredKiefer@gmx.de>
* TextConverters/RTF/RTFConsumer.m: Add empty appendImage: method

8
Source/GSNibLoading.m
View file

@ -95,6 +95,7 @@ static BOOL _isInInterfaceBuilder = NO;
@end
@interface NSMenu (GNUstepPrivate)
- (void) _setGeometry;
- (BOOL) _isMainMenu;
@end
@implementation NSMenu (NibCompatibility)
@ -1753,7 +1754,7 @@ static BOOL _isInInterfaceBuilder = NO;
NSObjectMapValueCallBacks, 2);
_oids = NSCreateMapTable(NSObjectMapKeyCallBacks,
NSObjectMapValueCallBacks, 2);
//
// Get the maps. There is no need to retain these,
// since they are going to be placed into the NSMapTable
@ -1937,6 +1938,11 @@ static BOOL _isInInterfaceBuilder = NO;
// objects on behalf of the owner.
RETAIN(obj);
}
if ([obj isKindOfClass: [NSMenu class]] &&
[obj _isMainMenu])
{
[NSApp _setMainMenu: obj];
}
}
}

2
Source/NSParagraphStyle.m
View file

@ -214,6 +214,7 @@ static NSParagraphStyle *defaultStyle = nil;
if (defaultStyle == nil)
{
NSParagraphStyle *style = [[self alloc] init];
/*
int i;
for (i = 0; i < 12; i++)
@ -225,6 +226,7 @@ static NSParagraphStyle *defaultStyle = nil;
[style->_tabStops addObject: tab];
RELEASE(tab);
}
*/
defaultStyle = style;
}
return defaultStyle;