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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							08deeba096
							
						
					 | 
					
						
						
							
							fix missing edge_nimbus_effect issue
						
						
						
						
						
						
					 | 
					
						2015-07-05 23:38:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							37481a2065
							
						
					 | 
					
						
						
							
							fix ghost image(#62)
						
						
						
						
						
						
					 | 
					
						2015-07-04 22:56:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8be566214c
							
						
					 | 
					
						
						
							
							fix a caret issue which happens when parent widget is hidden
						
						
						
						
						
						
					 | 
					
						2015-06-26 23:59:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							28413b7f25
							
						
					 | 
					
						
						
							
							explicit conversion from point/size to rectangle
						
						
						
						
						
						
					 | 
					
						2015-06-22 11:30:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bb9a09a8a
							
						
					 | 
					
						
						
							
							develop inline widgets for listbox
						
						
						
						
						
						
					 | 
					
						2015-06-21 04:44:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1822fafd79
							
						
					 | 
					
						
						
							
							construct the inline widget for listbox
						
						
						
						
						
						
					 | 
					
						2015-06-14 21:48:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							11d65763ce
							
						
					 | 
					
						
						
							
							fix a crash when the size of a label is empty and '\t' is contained
						
						
						
						
						
						
					 | 
					
						2015-05-29 00:09:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0259e6254
							
						
					 | 
					
						
						
							
							fixed a bground effect refresh issue.
						
						
						
						
						
						
					 | 
					
						2015-01-29 03:26:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a71f23ddd
							
						
					 | 
					
						
						
							
							Performance improvements
						
						
						
						
						
						
					 | 
					
						2015-01-09 08:12:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cnjinhao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0a317bd45
							
						
					 | 
					
						
						
							
							first init of 0.9
						
						
						
						
						
						
					 | 
					
						2014-12-11 03:32:35 +08:00 | 
					
					
						
						
							
							
							
						
					 |