From 77c3e8382186ecca24213d615e20017a127cc046 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Thu, 26 Nov 2015 13:55:39 -0500
Subject: [PATCH] Added uiLabel to WPF.

---
 wpf/label.cpp     | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 wpf/libui.msbuild |  1 +
 wpf/xtest.go      |  3 ++-
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 wpf/label.cpp

diff --git a/wpf/label.cpp b/wpf/label.cpp
new file mode 100644
index 00000000..c47dac80
--- /dev/null
+++ b/wpf/label.cpp
@@ -0,0 +1,46 @@
+// 26 november 2015
+#include "uipriv_wpf.hpp"
+
+// TODO alignment
+// TODO lots of padding
+
+struct uiLabel {
+	uiWindowsControl c;
+	gcroot<Label ^> *label;
+};
+
+uiWindowsDefineControl(
+	uiLabel,								// type name
+	uiLabelType,							// type function
+	label									// handle
+)
+
+char *uiLabelText(uiLabel *l)
+{
+	String ^text;
+
+	// TOOD bad cast?
+	text = (String ^) ((*(l->label))->Content);
+	return uiWindowsCLRStringToText(text);
+}
+
+void uiLabelSetText(uiLabel *l, const char *text)
+{
+	(*(l->label))->Content = fromUTF8(text);
+	// TODO does this adjust the layout?
+}
+
+uiLabel *uiNewLabel(const char *text)
+{
+	uiLabel *l;
+
+	l = (uiLabel *) uiNewControl(uiLabelType());
+
+	l->label = new gcroot<Label ^>();
+	*(l->label) = gcnew Label();
+	(*(l->label))->Content = fromUTF8(text);
+
+	uiWindowsFinishNewControl(l, uiLabel, label);
+
+	return l;
+}
diff --git a/wpf/libui.msbuild b/wpf/libui.msbuild
index bd602bdf..eb00c511 100755
--- a/wpf/libui.msbuild
+++ b/wpf/libui.msbuild
@@ -84,6 +84,7 @@
 	<ClCompile Include="init.c">
 		<CompileAsManaged>false</CompileAsManaged>
 	</ClCompile>
+	<ClCompile Include="label.cpp" />
 	<ClCompile Include="main.cpp" />
 	<ClCompile Include="tab.cpp" />
 	<ClCompile Include="text.cpp" />
diff --git a/wpf/xtest.go b/wpf/xtest.go
index dfa42afe..745c88c1 100644
--- a/wpf/xtest.go
+++ b/wpf/xtest.go
@@ -17,6 +17,7 @@ var uiBoxSetPadded = libui.NewProc("uiBoxSetPadded")
 var uiNewTab = libui.NewProc("uiNewTab")
 var uiTabAppend = libui.NewProc("uiTabAppend")
 var uiTabSetMargined = libui.NewProc("uiTabSetMargined")
+var uiNewLabel = libui.NewProc("uiNewLabel")
 var uiControlShow = libui.NewProc("uiControlShow")
 var uiMain = libui.NewProc("uiMain")
 var uiQuit = libui.NewProc("uiQuit")
@@ -45,7 +46,7 @@ func main() {
 	btn, _, _ = uiNewButton.Call(
 		uintptr(unsafe.Pointer(&s[0])))
 	uiBoxAppend.Call(box, btn, 1)
-	btn, _, _ = uiNewButton.Call(
+	btn, _, _ = uiNewLabel.Call(
 		uintptr(unsafe.Pointer(&s[0])))
 	uiBoxAppend.Call(box, btn, 0)
 	btn, _, _ = uiNewButton.Call(