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

1 files changed, 0 insertions, 57 deletions

diff --git a/src/libui_sdl/libui/unix/button.c b/src/libui_sdl/libui/unix/button.c
deleted file mode 100644
index b0500e3..0000000
--- a/src/libui_sdl/libui/unix/button.c
+++ /dev/null
@@ -1,57 +0,0 @@
-// 10 june 2015
-#include "uipriv_unix.h"
-
-struct uiButton {
-	uiUnixControl c;
-	GtkWidget *widget;
-	GtkButton *button;
-	void (*onClicked)(uiButton *, void *);
-	void *onClickedData;
-};
-
-uiUnixControlAllDefaults(uiButton)
-
-static void onClicked(GtkButton *button, gpointer data)
-{
-	uiButton *b = uiButton(data);
-
-	(*(b->onClicked))(b, b->onClickedData);
-}
-
-static void defaultOnClicked(uiButton *b, void *data)
-{
-	// do nothing
-}
-
-char *uiButtonText(uiButton *b)
-{
-	return uiUnixStrdupText(gtk_button_get_label(b->button));
-}
-
-void uiButtonSetText(uiButton *b, const char *text)
-{
-	gtk_button_set_label(b->button, text);
-}
-
-void uiButtonOnClicked(uiButton *b, void (*f)(uiButton *, void *), void *data)
-{
-	b->onClicked = f;
-	b->onClickedData = data;
-}
-
-uiButton *uiNewButton(const char *text)
-{
-	uiButton *b;
-
-	uiUnixNewControl(uiButton, b);
-
-	b->widget = gtk_button_new_with_label(text);
-	b->button = GTK_BUTTON(b->widget);
-
-	g_signal_connect(b->widget, "clicked", G_CALLBACK(onClicked), b);
-	uiButtonOnClicked(b, defaultOnClicked, NULL);
-	
-	gtk_widget_set_size_request(b->widget, 64, 1);
-
-	return b;
-}