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

Fixed a bunch of warnings on the OS X backend.

This commit is contained in:
Pietro Gagliardi 2015-05-10 14:21:35 -04:00
parent 262ffb0bde
commit ce96272f03
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
darwin/button.m
View File

@ -7,7 +7,7 @@
void *onClickedData; void *onClickedData;
} }
- (IBAction)buttonClicked:(id)sender; - (IBAction)buttonClicked:(id)sender;
- (void)setButton:(uiButton *)b; - (void)setButton:(uiButton *)newb;
- (void)setOnClicked:(void (*)(uiButton *, void *))f data:(void *)data; - (void)setOnClicked:(void (*)(uiButton *, void *))f data:(void *)data;
@end @end
@ -18,9 +18,9 @@
(*(self->onClicked))(self->b, self->onClickedData); (*(self->onClicked))(self->b, self->onClickedData);
} }
- (void)setButton:(uiButton *)b - (void)setButton:(uiButton *)newb
{ {
self->b = b; self->b = newb;
} }
- (void)setOnClicked:(void (*)(uiButton *, void *))f data:(void *)data - (void)setOnClicked:(void (*)(uiButton *, void *))f data:(void *)data

6
darwin/checkbox.m
View File

@ -7,7 +7,7 @@
void *onToggledData; void *onToggledData;
} }
- (IBAction)checkboxToggled:(id)sender; - (IBAction)checkboxToggled:(id)sender;
- (void)setCheckbox:(uiCheckbox *)c; - (void)setCheckbox:(uiCheckbox *)newc;
- (void)setOnToggled:(void (*)(uiCheckbox *, void *))f data:(void *)data; - (void)setOnToggled:(void (*)(uiCheckbox *, void *))f data:(void *)data;
@end @end
@ -18,9 +18,9 @@
(*(self->onToggled))(self->c, self->onToggledData); (*(self->onToggled))(self->c, self->onToggledData);
} }
- (void)setCheckbox:(uiCheckbox *)c - (void)setCheckbox:(uiCheckbox *)newc
{ {
self->c = c; self->c = newc;
} }
- (void)setOnToggled:(void (*)(uiCheckbox *, void *))f data:(void *)data - (void)setOnToggled:(void (*)(uiCheckbox *, void *))f data:(void *)data

2
darwin/container.m
View File

@ -130,7 +130,6 @@ static void containerHide(uiControl *cc)
static void containerEnable(uiControl *cc) static void containerEnable(uiControl *cc)
{ {
containerView *c = (containerView *) (cc->Internal);
uiControlSysFuncParams p; uiControlSysFuncParams p;
p.Func = uiDarwinSysFuncContainerEnable; p.Func = uiDarwinSysFuncContainerEnable;
@ -139,7 +138,6 @@ static void containerEnable(uiControl *cc)
static void containerDisable(uiControl *cc) static void containerDisable(uiControl *cc)
{ {
containerView *c = (containerView *) (cc->Internal);
uiControlSysFuncParams p; uiControlSysFuncParams p;
p.Func = uiDarwinSysFuncContainerDisable; p.Func = uiDarwinSysFuncContainerDisable;

8
darwin/entry.m
View File

@ -1,13 +1,13 @@
// 9 april 2015 // 9 april 2015
#import "uipriv_darwin.h" #import "uipriv_darwin.h"
@interface entryDelegate : NSObject { @interface entryDelegate : NSObject <NSTextFieldDelegate> {
uiEntry *e; uiEntry *e;
void (*onChanged)(uiEntry *, void *); void (*onChanged)(uiEntry *, void *);
void *onChangedData; void *onChangedData;
} }
- (void)controlTextDidChange:(NSNotification *)note; - (void)controlTextDidChange:(NSNotification *)note;
- (void)setEntry:(uiEntry *)e; - (void)setEntry:(uiEntry *)newe;
- (void)setOnChanged:(void (*)(uiEntry *, void *))f data:(void *)data; - (void)setOnChanged:(void (*)(uiEntry *, void *))f data:(void *)data;
@end @end
@ -18,9 +18,9 @@
(*(self->onChanged))(self->e, self->onChangedData); (*(self->onChanged))(self->e, self->onChangedData);
} }
- (void)setEntry:(uiEntry *)e - (void)setEntry:(uiEntry *)newe
{ {
self->e = e; self->e = newe;
} }
- (void)setOnChanged:(void (*)(uiEntry *, void *))f data:(void *)data - (void)setOnChanged:(void (*)(uiEntry *, void *))f data:(void *)data

4
darwin/menu.m
View File

@ -66,8 +66,8 @@ enum {
- (IBAction)onQuitClicked:(id)sender - (IBAction)onQuitClicked:(id)sender
{ {
if ([[NSApp delegate] applicationShouldTerminate:NSApp] == NSTerminateNow) if (shouldQuit())
[NSApp terminate:self]; uiQuit();
} }
- (void)register:(NSMenuItem *)item to:(struct menuItem *)smi - (void)register:(NSMenuItem *)item to:(struct menuItem *)smi