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

Merge 518ed415d4 into fea45b2d5b

This commit is contained in:
Niklas Mischkulnig 2021-01-02 10:21:29 -05:00 committed by GitHub
parent fea45b2d5b 518ed415d4
commit ea418f6abf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
darwin/main.m
View File

@ -199,7 +199,6 @@ int uiMainStep(int wait)
// - https://github.com/gnustep/gui/blob/master/Source/NSApplication.m // - https://github.com/gnustep/gui/blob/master/Source/NSApplication.m
int uiprivMainStep(uiprivNextEventArgs *nea, BOOL (^interceptEvent)(NSEvent *e)) int uiprivMainStep(uiprivNextEventArgs *nea, BOOL (^interceptEvent)(NSEvent *e))
{ {
NSDate *expire;
NSEvent *e; NSEvent *e;
NSEventType type; NSEventType type;

1
darwin/undocumented.m
View File

@ -21,7 +21,6 @@ void uiprivLoadUndocumented(void)
return; return;
#define GET(var, fn) *((void **) (&var)) = dlsym(handle, #fn) #define GET(var, fn) *((void **) (&var)) = dlsym(handle, #fn)
GET(str, kCTFontPreferredSubFamilyNameKey); GET(str, kCTFontPreferredSubFamilyNameKey);
NSLog(@"get %p", str);
if (str != NULL) if (str != NULL)
uiprivUNDOC_kCTFontPreferredSubFamilyNameKey = *str; uiprivUNDOC_kCTFontPreferredSubFamilyNameKey = *str;
GET(str, kCTFontPreferredFamilyNameKey); GET(str, kCTFontPreferredFamilyNameKey);

8
test/images.c
View File

@ -660,10 +660,10 @@ static const struct {
int height; int height;
int stride; int stride;
} files[] = { } files[] = {
{ "andlabs_16x16test_24june2016.png", dat0, 16, 16, 64 }, { "andlabs_16x16test_24june2016.png", (void *) dat0, 16, 16, 64 },
{ "andlabs_32x32test_24june2016.png", dat1, 32, 32, 128 }, { "andlabs_32x32test_24june2016.png", (void *) dat1, 32, 32, 128 },
{ "tango-icon-theme-0.8.90_16x16_x-office-spreadsheet.png", dat2, 16, 16, 64 }, { "tango-icon-theme-0.8.90_16x16_x-office-spreadsheet.png", (void *) dat2, 16, 16, 64 },
{ "tango-icon-theme-0.8.90_32x32_x-office-spreadsheet.png", dat3, 32, 32, 128 }, { "tango-icon-theme-0.8.90_32x32_x-office-spreadsheet.png", (void *) dat3, 32, 32, 128 },
}; };
void appendImageNamed(uiImage *img, const char *name) void appendImageNamed(uiImage *img, const char *name)

4
test/page13.c
View File

@ -119,11 +119,11 @@ uiBox *makePage13(void)
uiBoxAppend(page13, uiControl(rb), 0); uiBoxAppend(page13, uiControl(rb), 0);
b = uiNewButton("Horizontal"); b = uiNewButton("Horizontal");
uiButtonOnClicked(b, buttonClicked, uiNewHorizontalBox); uiButtonOnClicked(b, buttonClicked, (void *) uiNewHorizontalBox);
uiBoxAppend(page13, uiControl(b), 0); uiBoxAppend(page13, uiControl(b), 0);
b = uiNewButton("Vertical"); b = uiNewButton("Vertical");
uiButtonOnClicked(b, buttonClicked, uiNewVerticalBox); uiButtonOnClicked(b, buttonClicked, (void *) uiNewVerticalBox);
uiBoxAppend(page13, uiControl(b), 0); uiBoxAppend(page13, uiControl(b), 0);
f = newForm(); f = newForm();