Merge branch 'hotfix-1.3' into develop

2016-04-18 15:16:03 +08:00
parent 42990b8670 67431865c9
commit 116787072f
116 changed files with 2343 additions and 1004 deletions
--- a/source/gui/widgets/button.cpp
+++ b/source/gui/widgets/button.cpp
@@ -163,7 +163,7 @@ namespace nana{	namespace drawerbase
 			_m_press(graph, false);
 		}

-		void trigger::key_press(graph_reference graph, const arg_keyboard& arg)
+		void trigger::key_press(graph_reference, const arg_keyboard& arg)
 		{
 			bool ch_tabstop_next;
 			switch(arg.key)