From a79368e26b134b0fb661bd519c58b3c7c8827354 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Tue, 30 Jun 2015 11:26:54 -0400
Subject: [PATCH] Reimplemented GTK+ uiEntry.

---
 redo/unix/entry.c | 24 ++++++++++---
 unix/entry.c      | 92 -----------------------------------------------
 2 files changed, 20 insertions(+), 96 deletions(-)
 delete mode 100644 unix/entry.c

diff --git a/redo/unix/entry.c b/redo/unix/entry.c
index 0b851ce8..e29f3f17 100644
--- a/redo/unix/entry.c
+++ b/redo/unix/entry.c
@@ -8,10 +8,18 @@ struct entry {
 	GtkEditable *editable;
 	void (*onChanged)(uiEntry *, void *);
 	void *onChangedData;
+	gulong onChangedSignal;
 };
 
 uiDefineControlType(uiEntry, uiTypeEntry, struct entry)
 
+static void onChanged(GtkEditable *editable, gpointer data)
+{
+	struct entry *e = (struct entry *) data;
+
+	(*(e->onChanged))(uiEntry(e), e->onChangedData);
+}
+
 static uintptr_t entryHandle(uiControl *c)
 {
 	struct entry *e = (struct entry *) c;
@@ -28,14 +36,17 @@ static char *entryText(uiEntry *ee)
 {
 	struct entry *e = (struct entry *) ee;
 
-	return PUT_CODE_HERE;
+	return uiUnixStrdupText(gtk_entry_get_text(e->entry));
 }
 
 static void entrySetText(uiEntry *ee, const char *text)
 {
 	struct entry *e = (struct entry *) ee;
 
-	PUT_CODE_HERE;
+	// we need to inhibit sending of ::changed because this WILL send a ::changed otherwise
+	g_signal_handler_block(e->editable, e->onChangedSignal);
+	gtk_entry_set_text(e->entry, text);
+	g_signal_handler_unblock(e->editable, e->onChangedSignal);
 	// don't queue the control for resize; entry sizes are independent of their contents
 }
 
@@ -51,14 +62,18 @@ static int entryReadOnly(uiEntry *ee)
 {
 	struct entry *e = (struct entry *) ee;
 
-	return PUT_CODE_HERE;
+	return gtk_editable_get_editable(e->editable) == FALSE;
 }
 
 static void entrySetReadOnly(uiEntry *ee, int readonly)
 {
 	struct entry *e = (struct entry *) ee;
+	gboolean editable;
 
-	PUT_CODE_HERE;
+	editable = TRUE;
+	if (readonly)
+		editable = FALSE;
+	gtk_editable_set_editable(e->editable, editable);
 }
 
 uiEntry *uiNewEntry(void)
@@ -72,6 +87,7 @@ uiEntry *uiNewEntry(void)
 	e->editable = GTK_EDITABLE(e->widget);
 	uiUnixMakeSingleWidgetControl(uiControl(e), e->widget);
 
+	e->onChangedSignal = g_signal_connect(e->widget, "changed", G_CALLBACK(onChanged), e);
 	e->onChanged = defaultOnChanged;
 
 	uiControl(e)->Handle = entryHandle;
diff --git a/unix/entry.c b/unix/entry.c
deleted file mode 100644
index 301fbc05..00000000
--- a/unix/entry.c
+++ /dev/null
@@ -1,92 +0,0 @@
-// 8 april 2015
-#include "uipriv_unix.h"
-
-struct entry {
-	uiEntry e;
-	GtkWidget *widget;
-	GtkEntry *entry;
-	GtkEditable *editable;
-	void (*onChanged)(uiEntry *, void *);
-	void *onChangedData;
-	gulong onChangedSignal;
-};
-
-static void onChanged(GtkEditable *editable, gpointer data)
-{
-	struct entry *e = (struct entry *) data;
-
-	(*(e->onChanged))(uiEntry(e), e->onChangedData);
-}
-
-static void defaultOnChanged(uiEntry *e, void *data)
-{
-	// do nothing
-}
-
-static void onDestroy(void *data)
-{
-	struct entry *e = (struct entry *) data;
-
-	uiFree(e);
-}
-
-static char *entryText(uiEntry *ee)
-{
-	struct entry *e = (struct entry *) ee;
-
-	return uiUnixStrdupText(gtk_entry_get_text(e->entry));
-}
-
-static void entrySetText(uiEntry *ee, const char *text)
-{
-	struct entry *e = (struct entry *) ee;
-
-	// we need to inhibit sending of ::changed because this WILL send a ::changed otherwise
-	g_signal_handler_block(e->editable, e->onChangedSignal);
-	gtk_entry_set_text(e->entry, text);
-	g_signal_handler_unblock(e->editable, e->onChangedSignal);
-}
-
-static void entryOnChanged(uiEntry *ee, void (*f)(uiEntry *, void *), void *data)
-{
-	struct entry *e = (struct entry *) ee;
-
-	e->onChanged = f;
-	e->onChangedData = data;
-}
-
-static int entryReadOnly(uiEntry *ee)
-{
-	struct entry *e = (struct entry *) ee;
-
-	return gtk_editable_get_editable(e->editable) == FALSE;
-}
-
-static void entrySetReadOnly(uiEntry *ee, int readonly)
-{
-	struct entry *e = (struct entry *) ee;
-	gboolean editable;
-
-	editable = TRUE;
-	if (readonly)
-		editable = FALSE;
-	gtk_editable_set_editable(e->editable, editable);
-}
-
-uiEntry *uiNewEntry(void)
-{
-	struct entry *e;
-
-	e = uiNew(struct entry);
-
-	e->onChangedSignal = g_signal_connect(e->widget, "changed", G_CALLBACK(onChanged), e);
-	e->onChanged = defaultOnChanged;
-
-	uiEntry(e)->Text = entryText;
-	uiEntry(e)->SetText = entrySetText;
-	uiEntry(e)->OnChanged = entryOnChanged;
-	uiEntry(e)->ReadOnly = entryReadOnly;
-	uiEntry(e)->SetReadOnly = entrySetReadOnly;
-
-	return uiEntry(e);
-}