refactoring and fix

fix a potential dead-lock caused by timer

source/gui/widgets/categorize.cpp

@@ -1,7 +1,7 @@
 /**
  *	A Categorize Implementation
  *	Nana C++ Library(http://www.nanapro.org)
- *	Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com)
+ *	Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
  *
  *	Distributed under the Boost Software License, Version 1.0.
  *	(See accompanying file LICENSE_1_0.txt or copy at
@@ -10,7 +10,7 @@
  *	@file nana/gui/widgets/categorize.cpp
  */
 
-#include <nana/gui/wvl.hpp>
+#include <nana/gui/compact.hpp>
 #include <nana/gui/widgets/categorize.hpp>
 #include <nana/gui/widgets/float_listbox.hpp>
 #include <nana/gui/element.hpp>

source/gui/widgets/combox.cpp

@@ -10,9 +10,9 @@
  *	@file: nana/gui/widgets/combox.cpp
  */
 
-#include <nana/gui.hpp>
-#include <nana/gui/widgets/combox.hpp>
+#include <nana/gui/compact.hpp>
 #include <nana/gui/element.hpp>
+#include <nana/gui/widgets/combox.hpp>
 #include <nana/system/dataexch.hpp>
 #include <nana/gui/widgets/float_listbox.hpp>
 #include <nana/gui/widgets/skeletons/text_editor.hpp>

source/gui/widgets/listbox.cpp

@@ -15,7 +15,7 @@
  *		Benjamin Navarro(pr#81)
  *		besh81(pr#130)
  *		dankan1890(pr#158)
- *		ErrorFlynn(pr#418)
+ *		ErrorFlynn(pr#418,pr#448,pr#454)
  *
  */
 #include <algorithm>

source/gui/widgets/menu.cpp

@@ -13,12 +13,13 @@
 *		dankan1890(pr#158)
 */
 
+#include <nana/gui/compact.hpp>
+#include <nana/gui/screen.hpp>
 #include <nana/gui/widgets/menu.hpp>
 #include <nana/gui/timer.hpp>
 
 #include <nana/system/platform.hpp>
 #include <nana/gui/element.hpp>
-#include <nana/gui/wvl.hpp>
 #include <nana/paint/text_renderer.hpp>
 #include <cctype>	//introduces tolower
 #include <vector>