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

Merge from trunk

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/printing_fixes@40044 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2016-07-31 14:22:31 +00:00
commit 41427b2331
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2016-07-19 Riccardo Mottola <rm@gnu.org>
* Source/NSFontDescriptor.m
If we have no face set, don't append null
2016-07-18 11:59-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSView.m: Move to new branch.
2016-07-18 11:46-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSView.m: Revert previous changes. Moving to a branch.

4
Source/NSFontDescriptor.m
View file

@ -2,7 +2,7 @@
<abstract>The font descriptor class</abstract>
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007-2016 Free Software Foundation, Inc.
Author: H. Nikolaus Schaller <hns@computer.org>
Date: 2006
@ -268,7 +268,7 @@
withString: @""
options: 0
range: NSMakeRange(0, [family length])];
if ([face isEqualToString: @"Regular"])
if (!face || [face isEqualToString: @"Regular"])
return family;
return [NSString stringWithFormat: @"%@-%@", family, face];
}