From: John Hodge <tpg@mutabah.net>
Date: Sun, 5 Aug 2012 11:04:13 +0000 (+0800)
Subject: Merge branch 'master' of github.com:thepowersgang/acess2
X-Git-Tag: rel0.15~706^2~70
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=e8b89fea150a06598b9edd6a36d67fdc970a1219;hp=8dcc3e209d0d728565a18c8dca2b0ba220b74a6f;p=tpg%2Facess2.git

Merge branch 'master' of github.com:thepowersgang/acess2
---

diff --git a/Usermode/Applications/axwin3_src/Interface/main.c b/Usermode/Applications/axwin3_src/Interface/main.c
index fd4ff3f4..fee178ac 100644
--- a/Usermode/Applications/axwin3_src/Interface/main.c
+++ b/Usermode/Applications/axwin3_src/Interface/main.c
@@ -118,6 +118,7 @@ void mainmenu_app_terminal(void *unused)
 void mainmenu_run_dialog(void *unused)
 {
 	AxWin3_ShowWindow(gRunDialog, 1);
+	AxWin3_FocusWindow(gRunDialog);
 }
 
 void create_mainmenu(void)
diff --git a/Usermode/Libraries/libaxwin3.so_src/include_exp/axwin3/widget.h b/Usermode/Libraries/libaxwin3.so_src/include_exp/axwin3/widget.h
index 29a02251..9eca0b0d 100644
--- a/Usermode/Libraries/libaxwin3.so_src/include_exp/axwin3/widget.h
+++ b/Usermode/Libraries/libaxwin3.so_src/include_exp/axwin3/widget.h
@@ -46,6 +46,8 @@ enum eElementTypes
 {
 	ELETYPE_NONE,
 
+	ELETYPE_SUBWIN,
+
 	ELETYPE_BOX,	//!< Content box (invisible in itself)
 	ELETYPE_TEXT,	//!< Text
 	ELETYPE_IMAGE,	//!< Image