Merge remote-tracking branch 'remotes/origin/master' into melonDSi

1 files changed, 0 insertions, 43 deletions

diff --git a/src/libui_sdl/libui/darwin/label.m b/src/libui_sdl/libui/darwin/label.m
deleted file mode 100644
index 897bc3f..0000000
--- a/src/libui_sdl/libui/darwin/label.m
+++ /dev/null
@@ -1,43 +0,0 @@
-// 14 august 2015
-#import "uipriv_darwin.h"
-
-struct uiLabel {
-	uiDarwinControl c;
-	NSTextField *textfield;
-};
-
-uiDarwinControlAllDefaults(uiLabel, textfield)
-
-char *uiLabelText(uiLabel *l)
-{
-	return uiDarwinNSStringToText([l->textfield stringValue]);
-}
-
-void uiLabelSetText(uiLabel *l, const char *text)
-{
-	[l->textfield setStringValue:toNSString(text)];
-}
-
-NSTextField *newLabel(NSString *str)
-{
-	NSTextField *tf;
-
-	tf = [[NSTextField alloc] initWithFrame:NSZeroRect];
-	[tf setStringValue:str];
-	[tf setEditable:NO];
-	[tf setSelectable:NO];
-	[tf setDrawsBackground:NO];
-	finishNewTextField(tf, NO);
-	return tf;
-}
-
-uiLabel *uiNewLabel(const char *text)
-{
-	uiLabel *l;
-
-	uiDarwinNewControl(uiLabel, l);
-
-	l->textfield = newLabel(toNSString(text));
-
-	return l;
-}