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

Use new GSI api from base library

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12360 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-02-01 11:01:27 +00:00
parent e62b1743a6
commit 9de3b40693
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2002-02-01 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSLayoutManager.m:
* Source/GSTextStorage.m: Use new GSI API from latest CVS base
* library.
2002-01-31 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* Source/NSCell.m

13
Source/GSTextStorage.m
View file

@ -50,11 +50,12 @@
#define SANITY_CHECKS 0
#define GSI_MAP_RETAIN_KEY(X)
#define GSI_MAP_RELEASE_KEY(X)
#define GSI_MAP_RETAIN_VAL(X)
#define GSI_MAP_RELEASE_VAL(X)
#define GSI_MAP_EQUAL(X,Y) [(X).obj isEqualToDictionary: (Y).obj]
#define GSI_NEW 1
#define GSI_MAP_RETAIN_KEY(M, X)
#define GSI_MAP_RELEASE_KEY(M, X)
#define GSI_MAP_RETAIN_VAL(M, X)
#define GSI_MAP_RELEASE_VAL(M, X)
#define GSI_MAP_EQUAL(M, X,Y) [(X).obj isEqualToDictionary: (Y).obj]
#define GSI_MAP_KTYPES GSUNION_OBJ
#define GSI_MAP_VTYPES GSUNION_INT
@ -111,7 +112,7 @@ unCacheAttributes(NSDictionary *attrs)
{
GSIMapNode node;
node = GSIMapNodeForKeyInBucket(bucket, (GSIMapKey)attrs);
node = GSIMapNodeForKeyInBucket(&attrMap, bucket, (GSIMapKey)attrs);
if (node != 0)
{
if (--node->value.uint == 0)

3
Source/NSLayoutManager.m
View file

@ -149,7 +149,8 @@ typedef struct {
* pointers, objects, glyphs (long) and attributes.
*/
#define GSI_ARRAY_TYPES GSUNION_PTR|GSUNION_OBJ|GSUNION_LONG
#define GSI_ARRAY_EXTRA GSGlyphAttrs
#define GSI_NEW 1
#define GSI_ARRAY_TYPE GSGlyphAttrs
/*
* We handle retain/release explicitly, so we can use GSIArrays to hold