gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 19:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Two small changes that should make Emacs 23.1 usable with GNUstep.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28643 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2009-09-08 22:10:56 +00:00
parent bfe4ad5517
commit c10bfc152d
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2009-09-09 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSView.m (-_lockFocusInContext:inRect:): Correct the
handling of renewgstate.
* Source/GSFontInfo.m (GSFontEnumerator-availableFontDescriptors):
Retain the generated list of font descriptors.
2009-09-07 Fred Kiefer <FredKiefer@gmx.de> 2009-09-07 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSMenuItem.h: Let the protocol NSMenuItem * Headers/AppKit/NSMenuItem.h: Let the protocol NSMenuItem

2
Source/GSFontInfo.m
View file

@ -111,7 +111,7 @@ static GSFontEnumerator *sharedEnumerator = nil;
NSEnumerator *keyEnumerator; NSEnumerator *keyEnumerator;
NSString *family; NSString *family;
fontDescriptors = [NSMutableArray array]; fontDescriptors = [[NSMutableArray alloc] init];
keyEnumerator = [allFontFamilies keyEnumerator]; keyEnumerator = [allFontFamilies keyEnumerator];
while ((family = [keyEnumerator nextObject]) != nil) while ((family = [keyEnumerator nextObject]) != nil)
{ {

17
Source/NSView.m
View file

@ -1989,14 +1989,9 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
} }
else else
{ {
if (_gstate) if (_gstate && !_renew_gstate)
{ {
DPSsetgstate(ctxt, _gstate); DPSsetgstate(ctxt, _gstate);
if (_renew_gstate)
{
[self setUpGState];
_renew_gstate = NO;
}
DPSgsave(ctxt); DPSgsave(ctxt);
} }
else else
@ -2011,13 +2006,19 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
_renew_gstate = NO; _renew_gstate = NO;
if (_allocate_gstate) if (_allocate_gstate)
{ {
_gstate = GSDefineGState(ctxt); if (_gstate)
{
GSReplaceGState(ctxt, _gstate);
}
else
{
_gstate = GSDefineGState(ctxt);
}
/* Balance the previous gsave and install our own gstate */ /* Balance the previous gsave and install our own gstate */
DPSgrestore(ctxt); DPSgrestore(ctxt);
DPSsetgstate(ctxt, _gstate); DPSsetgstate(ctxt, _gstate);
DPSgsave(ctxt); DPSgsave(ctxt);
} }
} }
} }