mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 02:30:47 +00:00
Two small changes that should make Emacs 23.1 usable with GNUstep.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28643 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
bfe4ad5517
commit
c10bfc152d
3 changed files with 17 additions and 9 deletions
|
@ -111,7 +111,7 @@ static GSFontEnumerator *sharedEnumerator = nil;
|
|||
NSEnumerator *keyEnumerator;
|
||||
NSString *family;
|
||||
|
||||
fontDescriptors = [NSMutableArray array];
|
||||
fontDescriptors = [[NSMutableArray alloc] init];
|
||||
keyEnumerator = [allFontFamilies keyEnumerator];
|
||||
while ((family = [keyEnumerator nextObject]) != nil)
|
||||
{
|
||||
|
|
|
@ -1989,14 +1989,9 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
|
|||
}
|
||||
else
|
||||
{
|
||||
if (_gstate)
|
||||
if (_gstate && !_renew_gstate)
|
||||
{
|
||||
DPSsetgstate(ctxt, _gstate);
|
||||
if (_renew_gstate)
|
||||
{
|
||||
[self setUpGState];
|
||||
_renew_gstate = NO;
|
||||
}
|
||||
DPSgsave(ctxt);
|
||||
}
|
||||
else
|
||||
|
@ -2011,13 +2006,19 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
|
|||
_renew_gstate = NO;
|
||||
if (_allocate_gstate)
|
||||
{
|
||||
_gstate = GSDefineGState(ctxt);
|
||||
if (_gstate)
|
||||
{
|
||||
GSReplaceGState(ctxt, _gstate);
|
||||
}
|
||||
else
|
||||
{
|
||||
_gstate = GSDefineGState(ctxt);
|
||||
}
|
||||
/* Balance the previous gsave and install our own gstate */
|
||||
DPSgrestore(ctxt);
|
||||
DPSsetgstate(ctxt, _gstate);
|
||||
DPSgsave(ctxt);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue