Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8594d175e1 
							
						 
					 
					
						
						
							
							Merge branch 'toborrobot-develop' into hotfix-1.4.1  
						
						
						
						
					 
					
						2016-11-14 05:34:45 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5564a0299b 
							
						 
					 
					
						
						
							
							Merge branch 'dankan1890-icon_fix' into develop  
						
						
						
						
					 
					
						2016-11-14 03:27:11 +08:00 
						 
				 
			
				
					
						
							
							
								Rei 
							
						 
					 
					
						
						
						
						
							
						
						
							f42cd7b2eb 
							
						 
					 
					
						
						
							
							Include cstring header on image_png.hpp  
						
						... 
						
						
						
						Compilation was failing with the "enable png" flag. This was happening
because the memcpy function was being called without the inclusion of
cstring, which declares it. This fixes it. 
						
						
					 
					
						2016-11-05 04:46:29 -02:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							565b612ea7 
							
						 
					 
					
						
						
							
							Added colors scheme.  
						
						
						
						
					 
					
						2016-11-04 00:21:34 +01:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							6e754e94a8 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/cnjinhao/nana  into icon_fix  
						
						
						
						
					 
					
						2016-11-04 00:03:25 +01:00 
						 
				 
			
				
					
						
							
							
								Toby Case 
							
						 
					 
					
						
						
						
						
							
						
						
							c2640f5524 
							
						 
					 
					
						
						
							
							- Include nana/deploy.hpp to declare to_utf8  
						
						... 
						
						
						
						- Was preventing compilation of nana library 
						
						
					 
					
						2016-11-02 18:09:10 -07:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5e6b13d23b 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4.1' into develop  
						
						
						
						
					 
					
						2016-11-02 22:48:56 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							a1eeeee948 
							
						 
					 
					
						
						
							
							fix a widget::i18n compiler error  
						
						
						
						
					 
					
						2016-11-02 21:55:19 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8e228512d5 
							
						 
					 
					
						
						
							
							fix some i18n errors  
						
						
						
						
					 
					
						2016-11-02 21:50:52 +08:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							f9e06c04e2 
							
						 
					 
					
						
						
							
							fixed linux support.  
						
						
						
						
					 
					
						2016-11-02 09:33:18 +01:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							043ebad317 
							
						 
					 
					
						
						
							
							fix some compiler errors and warnings  
						
						
						
						
					 
					
						2016-10-31 06:36:03 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							b1ce0eaff2 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4.1' into develop  
						
						
						
						
					 
					
						2016-10-31 06:21:41 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							a3de89aab5 
							
						 
					 
					
						
						
							
							Merge branch 'PeterAddy960-hotfix-1.4' into hotfix-1.4.1  
						
						
						
						
					 
					
						2016-10-31 06:14:10 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							edc8304c22 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4' of  https://github.com/PeterAddy960/nana  into PeterAddy960-hotfix-1.4  
						
						
						
						
					 
					
						2016-10-31 06:13:41 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							7ffad3c877 
							
						 
					 
					
						
						
							
							Merge branch 'dankan1890-features' into develop  
						
						
						
						
					 
					
						2016-10-31 05:45:34 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							60c35b07f6 
							
						 
					 
					
						
						
							
							Merge branch 'qflow-master' into hotfix-1.4.1  
						
						
						
						
					 
					
						2016-10-31 05:42:45 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							e6438919c0 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/qflow/nana  into qflow-master  
						
						
						
						
					 
					
						2016-10-31 05:42:25 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							445f0ed6de 
							
						 
					 
					
						
						
							
							fix issue of menu item_proxy  
						
						
						
						
					 
					
						2016-10-31 04:33:42 +08:00 
						 
				 
			
				
					
						
							
							
								PeterAddy960 
							
						 
					 
					
						
						
						
						
							
						
						
							8e84383a7b 
							
						 
					 
					
						
						
							
							Added an overload to getline to allow an offset from the beginning of the line.  
						
						... 
						
						
						
						Added a clear undo method.
Added an overload to selected to get the selected bounds. 
						
						
					 
					
						2016-10-28 00:17:59 -05:00 
						 
				 
			
				
					
						
							
							
								PeterAddy960 
							
						 
					 
					
						
						
						
						
							
						
						
							78c3527f10 
							
						 
					 
					
						
						
							
							Modified the implementation so that nana: ⌨️ :os_del is sent throght the set_accept function, so that os_del can be blocked.  
						
						... 
						
						
						
						Added overload to selected to get the selection bounds. 
						
						
					 
					
						2016-10-28 00:10:11 -05:00 
						 
				 
			
				
					
						
							
							
								PeterAddy960 
							
						 
					 
					
						
						
						
						
							
						
						
							ea1edb5a4a 
							
						 
					 
					
						
						
							
							Added a clear undo method.  
						
						... 
						
						
						
						Added an overload to selected to get the selection bounds.
Added an overload to the getline method to allow an offset from the beginning of the line. 
						
						
					 
					
						2016-10-28 00:07:33 -05:00 
						 
				 
			
				
					
						
							
							
								PeterAddy960 
							
						 
					 
					
						
						
						
						
							
						
						
							021ee1edb4 
							
						 
					 
					
						
						
							
							Added a clear undo method to the textbox to erase all previous undo actions.  
						
						... 
						
						
						
						Added an overload to the selected method that give back the bounds of the selection. 
						
						
					 
					
						2016-10-28 00:05:56 -05:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							e7ce506f5a 
							
						 
					 
					
						
						
							
							fix an exception of msg_dispatcher  
						
						
						
						
					 
					
						2016-10-19 04:01:40 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							9ed5e81ca2 
							
						 
					 
					
						
						
							
							fix the revertable lock of window_manager  
						
						
						
						
					 
					
						2016-10-19 02:58:49 +08:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							afa9cffd51 
							
						 
					 
					
						
						
							
							Added multi platform support for ICOns files.  
						
						
						
						
					 
					
						2016-10-18 00:32:58 +02:00 
						 
				 
			
				
					
						
							
							
								Michal Fojtak 
							
						 
					 
					
						
						
						
						
							
						
						
							e7181a7007 
							
						 
					 
					
						
						
							
							vs"15" fix  
						
						
						
						
					 
					
						2016-10-17 15:27:38 +02:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							47b2234932 
							
						 
					 
					
						
						
							
							fix wrong pr number.  
						
						
						
						
					 
					
						2016-10-16 07:11:40 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							57aa0498b3 
							
						 
					 
					
						
						
							
							some modifications for pr( #154 )  
						
						... 
						
						
						
						update contributor info 
						
						
					 
					
						2016-10-16 07:07:44 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8f0d79b88d 
							
						 
					 
					
						
						
							
							Merge branch 'dankan1890-features' into develop  
						
						
						
						
					 
					
						2016-10-15 23:49:24 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							01ff1c11c1 
							
						 
					 
					
						
						
							
							fix bug that some events of textbox would not be triggered  
						
						
						
						
					 
					
						2016-10-15 07:05:43 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							1332b3e6d8 
							
						 
					 
					
						
						
							
							fix a compiling error  
						
						
						
						
					 
					
						2016-10-14 23:00:46 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							3d2dbf60af 
							
						 
					 
					
						
						
							
							fix bug that mousedown/click would not triggerred  
						
						
						
						
					 
					
						2016-10-14 21:54:09 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							092ae97c66 
							
						 
					 
					
						
						
							
							fix transparent window bugs  
						
						
						
						
					 
					
						2016-10-14 07:19:56 +08:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							d7b7a4d45f 
							
						 
					 
					
						
						
							
							listbox:  
						
						... 
						
						
						
						Added header_fgcolor and item_highlighted to color scheme.
menu:
Added change_text function. 
						
						
					 
					
						2016-10-14 01:14:55 +02:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							7c36c27d46 
							
						 
					 
					
						
						
							
							fix group bgcolor issue  
						
						
						
						
					 
					
						2016-10-11 02:53:41 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8fe39df8b4 
							
						 
					 
					
						
						
							
							fix an issue of place number type( #157 )  
						
						... 
						
						
						
						missing conversion from real to percent 
						
						
					 
					
						2016-10-06 08:53:17 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5383d85cc0 
							
						 
					 
					
						
						
							
							add support of div-text update for splitter( #157 )  
						
						
						
						
					 
					
						2016-10-05 09:41:44 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							7f45ae4342 
							
						 
					 
					
						
						
							
							add a param to listbox::item_proxy's check/select  
						
						... 
						
						
						
						this new parameter is used to indicate whether to scroll the view to the
item if the item is not displayed on screen. 
						
						
					 
					
						2016-10-03 09:07:37 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							fb27eece33 
							
						 
					 
					
						
						
							
							change some names base on  #156  
						
						
						
						
					 
					
						2016-10-03 05:36:13 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8d145a97a0 
							
						 
					 
					
						
						
							
							Merge branch 'dankan1890-develop' into develop  
						
						
						
						
					 
					
						2016-10-03 05:23:24 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							2614c55e30 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/dankan1890/nana  into dankan1890-develop  
						
						
						
						
					 
					
						2016-10-03 05:22:40 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							d8ce7ea1ba 
							
						 
					 
					
						
						
							
							fix the issue of place find_str( #156 )  
						
						
						
						
					 
					
						2016-10-03 05:11:00 +08:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							e5c14570cb 
							
						 
					 
					
						
						
							
							fix exact match in find_idstr. (note: removed isalpha, isalnum already performs that check)  
						
						
						
						
					 
					
						2016-10-02 22:17:59 +02:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							4b58704161 
							
						 
					 
					
						
						
							
							fix issue when textbox::reset with no parameter  
						
						
						
						
					 
					
						2016-10-01 10:07:13 +08:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							818c7459e7 
							
						 
					 
					
						
						
							
							place::modify() now correctly updates the text to place::div_text.  
						
						... 
						
						
						
						Note: I reverted the previous commit because it had an incorrect formatting. 
						
						
					 
					
						2016-09-29 14:00:45 +02:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							00e9c0a21f 
							
						 
					 
					
						
						
							
							reverted  
						
						
						
						
					 
					
						2016-09-29 13:56:36 +02:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							3c2b36ead8 
							
						 
					 
					
						
						
							
							place::modify() now correctly updates the place::div_text.  
						
						
						
						
					 
					
						2016-09-29 13:54:12 +02:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							830839ae27 
							
						 
					 
					
						
						
							
							add place::div() to return the div text  
						
						... 
						
						
						
						introduce keywords 'undisplayed' and 'invisible' into div-text 
						
						
					 
					
						2016-09-28 07:47:53 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							61832c0a7c 
							
						 
					 
					
						
						
							
							Merge branch 'develop'  
						
						
						
						
					 
					
						2016-09-25 22:24:22 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8b652ee308 
							
						 
					 
					
						
						
							
							fix i18n for msgbox  
						
						
						
						
					 
					
						2016-09-25 20:11:50 +08:00