interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Avoid merge conflict in uipriv_darwin.h." 

Nope, this confused git further

This reverts commit dc98bc2c25.
This commit is contained in:
Pietro Gagliardi 2018-05-06 21:26:51 -04:00
parent dc98bc2c25
commit 221e8731c0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
darwin/uipriv_darwin.h
View File

@ -19,15 +19,6 @@
#define NSAppKitVersionNumber10_9 1265 #define NSAppKitVersionNumber10_9 1265
#endif #endif
// map.m
extern struct mapTable *newMap(void);
extern void mapDestroy(struct mapTable *m);
extern void *mapGet(struct mapTable *m, void *key);
extern void mapSet(struct mapTable *m, void *key, void *value);
extern void mapDelete(struct mapTable *m, void *key);
extern void mapWalk(struct mapTable *m, void (*f)(void *key, void *value));
extern void mapReset(struct mapTable *m);
// menu.m // menu.m
@interface menuManager : NSObject { @interface menuManager : NSObject {
struct mapTable *items; struct mapTable *items;
@ -97,6 +88,15 @@ extern void singleChildConstraintsEstablish(struct singleChildConstraints *c, NS
extern void singleChildConstraintsRemove(struct singleChildConstraints *c, NSView *cv); extern void singleChildConstraintsRemove(struct singleChildConstraints *c, NSView *cv);
extern void singleChildConstraintsSetMargined(struct singleChildConstraints *c, int margined); extern void singleChildConstraintsSetMargined(struct singleChildConstraints *c, int margined);
// map.m
extern struct mapTable *newMap(void);
extern void mapDestroy(struct mapTable *m);
extern void *mapGet(struct mapTable *m, void *key);
extern void mapSet(struct mapTable *m, void *key, void *value);
extern void mapDelete(struct mapTable *m, void *key);
extern void mapWalk(struct mapTable *m, void (*f)(void *key, void *value));
extern void mapReset(struct mapTable *m);
// area.m // area.m
extern int sendAreaEvents(NSEvent *); extern int sendAreaEvents(NSEvent *);