Merge 518ed415d4
into fea45b2d5b
This commit is contained in:
commit
ea418f6abf
|
@ -199,7 +199,6 @@ int uiMainStep(int wait)
|
|||
// - https://github.com/gnustep/gui/blob/master/Source/NSApplication.m
|
||||
int uiprivMainStep(uiprivNextEventArgs *nea, BOOL (^interceptEvent)(NSEvent *e))
|
||||
{
|
||||
NSDate *expire;
|
||||
NSEvent *e;
|
||||
NSEventType type;
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@ void uiprivLoadUndocumented(void)
|
|||
return;
|
||||
#define GET(var, fn) *((void **) (&var)) = dlsym(handle, #fn)
|
||||
GET(str, kCTFontPreferredSubFamilyNameKey);
|
||||
NSLog(@"get %p", str);
|
||||
if (str != NULL)
|
||||
uiprivUNDOC_kCTFontPreferredSubFamilyNameKey = *str;
|
||||
GET(str, kCTFontPreferredFamilyNameKey);
|
||||
|
|
|
@ -660,10 +660,10 @@ static const struct {
|
|||
int height;
|
||||
int stride;
|
||||
} files[] = {
|
||||
{ "andlabs_16x16test_24june2016.png", dat0, 16, 16, 64 },
|
||||
{ "andlabs_32x32test_24june2016.png", 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_32x32_x-office-spreadsheet.png", dat3, 32, 32, 128 },
|
||||
{ "andlabs_16x16test_24june2016.png", (void *) dat0, 16, 16, 64 },
|
||||
{ "andlabs_32x32test_24june2016.png", (void *) dat1, 32, 32, 128 },
|
||||
{ "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", (void *) dat3, 32, 32, 128 },
|
||||
};
|
||||
|
||||
void appendImageNamed(uiImage *img, const char *name)
|
||||
|
|
|
@ -119,11 +119,11 @@ uiBox *makePage13(void)
|
|||
uiBoxAppend(page13, uiControl(rb), 0);
|
||||
|
||||
b = uiNewButton("Horizontal");
|
||||
uiButtonOnClicked(b, buttonClicked, uiNewHorizontalBox);
|
||||
uiButtonOnClicked(b, buttonClicked, (void *) uiNewHorizontalBox);
|
||||
uiBoxAppend(page13, uiControl(b), 0);
|
||||
|
||||
b = uiNewButton("Vertical");
|
||||
uiButtonOnClicked(b, buttonClicked, uiNewVerticalBox);
|
||||
uiButtonOnClicked(b, buttonClicked, (void *) uiNewVerticalBox);
|
||||
uiBoxAppend(page13, uiControl(b), 0);
|
||||
|
||||
f = newForm();
|
||||
|
|
Loading…
Reference in New Issue