Jinhao b1ed1f0452 Merge branch 'hotfixes-1.0.2' into develop ...

Conflicts:
	include/nana/gui/detail/basic_window.hpp
	include/nana/gui/widgets/listbox.hpp
	source/gui/detail/linux_X11/bedrock.cpp
	source/gui/detail/win32/bedrock.cpp
	source/gui/detail/window_layout.cpp
	source/gui/detail/window_manager.cpp
	source/gui/widgets/listbox.cpp
	source/gui/widgets/toolbar.cpp

2015-07-11 13:35:22 +08:00

..

linux_X11

Merge branch 'hotfixes-1.0.2' into develop

2015-07-11 13:35:22 +08:00

win32

Merge branch 'hotfixes-1.0.2' into develop

2015-07-11 13:35:22 +08:00

basic_window.cpp

Merge branch 'hotfixes-1.0.2' into develop

2015-07-11 13:35:22 +08:00

bedrock_pi.cpp

Merge branch 'hotfixes-1.0.2' into develop

2015-07-11 13:35:22 +08:00

bedrock_selector.cpp

fix menubar behavior issue

2015-04-21 22:33:18 +08:00

color_schemes.cpp

Added listbox color scheme

2014-12-30 06:28:23 +08:00

drawer.cpp

Merge branch 'hotfixes-1.0.2' into develop

2015-07-11 13:35:22 +08:00

element_store.cpp

first init of 0.9

2014-12-11 03:32:35 +08:00

events_operation.cpp

fix false alarm of event memory leak

2015-04-10 00:44:49 +08:00

native_window_interface.cpp

explicit conversion from point/size to rectangle

2015-06-22 11:30:14 +08:00

window_layout.cpp

Merge branch 'hotfixes-1.0.2' into develop

2015-07-11 13:35:22 +08:00

window_manager.cpp

Merge branch 'hotfixes-1.0.2' into develop

2015-07-11 13:35:22 +08:00