[adobe-source-commits] adobe-source/adobe/future/widgets/sources/win display.cpp,1.2,1.3 ui_core_implementation.cpp,1.5,1.6 ui_overlay.cpp,1.2,1.3

[Foster B. <fos...@us...>]

Update of /cvsroot/adobe-source/adobe-source/adobe/future/widgets/sources/win
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/future/widgets/sources/win

Modified Files:
	display.cpp ui_core_implementation.cpp ui_overlay.cpp 
Log Message:
asl 1.0.12

Index: display.cpp
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/future/widgets/sources/win/display.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** display.cpp	7 Nov 2005 18:00:43 -0000	1.2
--- display.cpp	6 Jan 2006 18:35:21 -0000	1.3
***************
*** 1,4 ****
  /*
! 	Copyright 2005 Adobe Systems Incorporated
  	Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
  	or a copy at http://opensource.adobe.com/licenses.html)
--- 1,4 ----
  /*
! 	Copyright 2005-2006 Adobe Systems Incorporated
  	Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
  	or a copy at http://opensource.adobe.com/licenses.html)

Index: ui_overlay.cpp
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/future/widgets/sources/win/ui_overlay.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ui_overlay.cpp	7 Nov 2005 18:00:43 -0000	1.2
--- ui_overlay.cpp	6 Jan 2006 18:35:21 -0000	1.3
***************
*** 1,4 ****
  /*
! 	Copyright 2005 Adobe Systems Incorporated
  	Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
  	or a copy at http://opensource.adobe.com/licenses.html)
--- 1,4 ----
  /*
! 	Copyright 2005-2006 Adobe Systems Incorporated
  	Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
  	or a copy at http://opensource.adobe.com/licenses.html)
***************
*** 219,223 ****
  	overlay_forest_t::iterator position(unwrap(parent));
  
! 	position.set_leading(false);
  
  	return wrap(tree_m.insert(position, overlay_data_t()));
--- 219,223 ----
  	overlay_forest_t::iterator position(unwrap(parent));
  
!     position.edge() = adobe::forest_trailing_edge;
  
  	return wrap(tree_m.insert(position, overlay_data_t()));

Index: ui_core_implementation.cpp
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/future/widgets/sources/win/ui_core_implementation.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ui_core_implementation.cpp	2 Dec 2005 02:52:56 -0000	1.5
--- ui_core_implementation.cpp	6 Jan 2006 18:35:21 -0000	1.6
***************
*** 1,4 ****
  /*
! 	Copyright 2005 Adobe Systems Incorporated
  	Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
  	or a copy at http://opensource.adobe.com/licenses.html)
--- 1,4 ----
  /*
! 	Copyright 2005-2006 Adobe Systems Incorporated
  	Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
  	or a copy at http://opensource.adobe.com/licenses.html)
***************
*** 246,254 ****
  	assert(window);
  
! 	std::vector<WCHAR> titlename;
  
! 	titlename.resize(1024);
  
! 	*(&titlename[::GetWindowTextW(window, &titlename[0], 1024)]) = 0;
  
  	return std::string(hackery::convert_utf(&titlename[0]));
--- 246,256 ----
  	assert(window);
  
!   int const buffer_size = ::GetWindowTextLengthW(window) + 1;
  
!   std::vector<WCHAR> titlename(buffer_size, 0);
  
!   int const text_length = ::GetWindowTextW(window, &titlename[0], buffer_size);
! 
!   assert(text_length < buffer_size);
  
  	return std::string(hackery::convert_utf(&titlename[0]));
***************
*** 892,895 ****
--- 894,907 ----
  	{
  		//
+ 		// REVISIT (ralpht): Don't do anything if the panel's parent isn't a tab control.
+ 		//
+ 		HWND parent = GetParent(panel);
+ 		if (parent) {
+ 			std::vector<WCHAR> classname(1024);
+ 			*(&classname[::GetClassNameW(parent, &classname[0], 1024)]) = 0;
+ 			if (std::wstring(&classname[0]) != std::wstring(WC_TABCONTROL))
+ 				return DefWindowProc(panel, message, wParam, lParam);
+ 		}
+ 		//
  		// If we are not using visual styles then we don't have to do
  		// anything here -- the default window procedure is correct.
***************
*** 3144,3148 ****
  	//
  	position.y_m += baseline - edit_baseline_m;
! 	geometry.height() = edit_height_m;
  	_super::set_bounds(position, geometry);
  }
--- 3156,3163 ----
  	//
  	position.y_m += baseline - edit_baseline_m;
! 
!   // Do we need to adapt the height for baseline alignment? (thw)
!   // Disabled as it disables vertical align_fill (thw)
!   // geometry.height() = edit_height_m;
  	_super::set_bounds(position, geometry);
  }
***************
*** 3221,3239 ****
  	assert(control_m);
  
! 	std::string				cr_map(text);
! 	std::string::size_type	pos(0);
! 
! 	while (true)
! 	{
! 		pos = cr_map.find('\n', pos);
! 
! 		if (pos == std::string::npos) break;
! 
! 		cr_map.insert(pos, "\r");
! 
! 		pos += 2;
! 	}
  
! 	::SendMessageW(control_m, WM_SETTEXT, 0, (LPARAM) hackery::convert_utf(cr_map.c_str()).c_str());
  }
  
--- 3236,3244 ----
  	assert(control_m);
  
! 	// REVISIT (fbrereto) : Currently we require the line endings to be whatever the platform wants.
! 	//						I'm not sure we want to make it the burden of the widget to handle all
! 	//						forms of line endings.
  
! 	::SendMessageW(control_m, WM_SETTEXT, 0, (LPARAM) hackery::convert_utf(text.c_str()).c_str());
  }