From: John Hodge (sonata) <tpg@mutabah.net>
Date: Sat, 15 Mar 2014 10:17:09 +0000 (+0800)
Subject: Minor misc fixes
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=32980a36e515d1be2da1c7bf551070d4e972963e;p=tpg%2Facess2.git

Minor misc fixes
---

diff --git a/Externals/libspiderscript/source b/Externals/libspiderscript/source
index a5d190a8..9f2d7faf 160000
--- a/Externals/libspiderscript/source
+++ b/Externals/libspiderscript/source
@@ -1 +1 @@
-Subproject commit a5d190a89ca3f3a78c8b44a855b044ff4e713bb3
+Subproject commit 9f2d7faf34c16ceaee2f1bffe3d5558c41382523
diff --git a/Usermode/Applications/axwin3_src/WM/renderers/widget/textinput.c b/Usermode/Applications/axwin3_src/WM/renderers/widget/textinput.c
index 83352417..de862bfe 100644
--- a/Usermode/Applications/axwin3_src/WM/renderers/widget/textinput.c
+++ b/Usermode/Applications/axwin3_src/WM/renderers/widget/textinput.c
@@ -118,7 +118,7 @@ void Widget_TextInput_Init(tElement *Element)
 	info->DrawOfs = 0;
 	info->CursorXOfs = 0;
 	info->CursorByteOfs = 0;
-	info->Length = NULL;
+	info->Length = 0;
 
 	// No need to explicitly update parent min dims, as the AddElement routine does that	
 }
diff --git a/Usermode/Applications/axwin3_src/WM/wm.c b/Usermode/Applications/axwin3_src/WM/wm.c
index b304cacd..cc7e86ea 100644
--- a/Usermode/Applications/axwin3_src/WM/wm.c
+++ b/Usermode/Applications/axwin3_src/WM/wm.c
@@ -13,6 +13,7 @@
 #include <wm_messages.h>
 #include <decorator.h>
 #include <axwin3/keysyms.h>
+#include <wm_hotkeys.h>
 
 // === IMPORTS ===
 extern int	Renderer_Menu_Init(void);