From ce96272f03b43b6c0c36b8180c09cc9cdc69bb4d Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 10 May 2015 14:21:35 -0400
Subject: [PATCH] Fixed a bunch of warnings on the OS X backend.

---
 darwin/button.m    | 6 +++---
 darwin/checkbox.m  | 6 +++---
 darwin/container.m | 2 --
 darwin/entry.m     | 8 ++++----
 darwin/menu.m      | 4 ++--
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/darwin/button.m b/darwin/button.m
index cd8ab65e..3b07093e 100644
--- a/darwin/button.m
+++ b/darwin/button.m
@@ -7,7 +7,7 @@
 	void *onClickedData;
 }
 - (IBAction)buttonClicked:(id)sender;
-- (void)setButton:(uiButton *)b;
+- (void)setButton:(uiButton *)newb;
 - (void)setOnClicked:(void (*)(uiButton *, void *))f data:(void *)data;
 @end
 
@@ -18,9 +18,9 @@
 	(*(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
diff --git a/darwin/checkbox.m b/darwin/checkbox.m
index 0b5c8b80..261baa78 100644
--- a/darwin/checkbox.m
+++ b/darwin/checkbox.m
@@ -7,7 +7,7 @@
 	void *onToggledData;
 }
 - (IBAction)checkboxToggled:(id)sender;
-- (void)setCheckbox:(uiCheckbox *)c;
+- (void)setCheckbox:(uiCheckbox *)newc;
 - (void)setOnToggled:(void (*)(uiCheckbox *, void *))f data:(void *)data;
 @end
 
@@ -18,9 +18,9 @@
 	(*(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
diff --git a/darwin/container.m b/darwin/container.m
index a236d33b..340d4d0f 100644
--- a/darwin/container.m
+++ b/darwin/container.m
@@ -130,7 +130,6 @@ static void containerHide(uiControl *cc)
 
 static void containerEnable(uiControl *cc)
 {
-	containerView *c = (containerView *) (cc->Internal);
 	uiControlSysFuncParams p;
 
 	p.Func = uiDarwinSysFuncContainerEnable;
@@ -139,7 +138,6 @@ static void containerEnable(uiControl *cc)
 
 static void containerDisable(uiControl *cc)
 {
-	containerView *c = (containerView *) (cc->Internal);
 	uiControlSysFuncParams p;
 
 	p.Func = uiDarwinSysFuncContainerDisable;
diff --git a/darwin/entry.m b/darwin/entry.m
index 4f79954e..b8940be9 100644
--- a/darwin/entry.m
+++ b/darwin/entry.m
@@ -1,13 +1,13 @@
 // 9 april 2015
 #import "uipriv_darwin.h"
 
-@interface entryDelegate : NSObject {
+@interface entryDelegate : NSObject <NSTextFieldDelegate> {
 	uiEntry *e;
 	void (*onChanged)(uiEntry *, void *);
 	void *onChangedData;
 }
 - (void)controlTextDidChange:(NSNotification *)note;
-- (void)setEntry:(uiEntry *)e;
+- (void)setEntry:(uiEntry *)newe;
 - (void)setOnChanged:(void (*)(uiEntry *, void *))f data:(void *)data;
 @end
 
@@ -18,9 +18,9 @@
 	(*(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
diff --git a/darwin/menu.m b/darwin/menu.m
index 56cae820..d5cb84b8 100644
--- a/darwin/menu.m
+++ b/darwin/menu.m
@@ -66,8 +66,8 @@ enum {
 
 - (IBAction)onQuitClicked:(id)sender
 {
-	if ([[NSApp delegate] applicationShouldTerminate:NSApp] == NSTerminateNow)
-		[NSApp terminate:self];
+	if (shouldQuit())
+		uiQuit();
 }
 
 - (void)register:(NSMenuItem *)item to:(struct menuItem *)smi