[adobe-source-commits] sandbox/adobe-source/adobe/test/visual/sources/win ui_core_implementation.cpp

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/win
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/adobe-source/adobe/test/visual/sources/win

Modified Files:
	ui_core_implementation.cpp 
Log Message:
Fixes an error when building in release mode and silences GCC warnings (initialization order of member fields, unused variables)

Index: ui_core_implementation.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/win/ui_core_implementation.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ui_core_implementation.cpp	18 Apr 2005 17:20:37 -0000	1.17
--- ui_core_implementation.cpp	20 Apr 2005 08:03:02 -0000	1.18
***************
*** 432,437 ****
  	{
  		static const long	link_line_width(2);
! 		HWND				parent(::GetAncestor(link.control_m, GA_ROOT));
! 		long				num_prongs(link.prongs_m.size());
  		RECT				bounds = { 0 };
  		point_set_t			points;
--- 432,438 ----
  	{
  		static const long	link_line_width(2);
! 		// curently unused:
! 		//	HWND				parent(::GetAncestor(link.control_m, GA_ROOT));
! 		std::size_t			num_prongs(link.prongs_m.size());
  		RECT				bounds = { 0 };
  		point_set_t			points;
***************
*** 479,485 ****
  			bounds.right += 2; // reset inset for the link icon
  
! 			short	center =	bounds.top +
! 								link.prongs_m[0] - link_line_width +
! 								(link.prongs_m[num_prongs - 1] - link.prongs_m[0]) / 2;
  
  			// draw link icon here at { bounds.right - 5, center - 8, 9, 16 }
--- 480,487 ----
  			bounds.right += 2; // reset inset for the link icon
  
! 			// currently unused:
! 			//	short	center =	bounds.top +
! 			//						link.prongs_m[0] - link_line_width +
! 			//						(link.prongs_m[num_prongs - 1] - link.prongs_m[0]) / 2;
  
  			// draw link icon here at { bounds.right - 5, center - 8, 9, 16 }
***************
*** 1543,1547 ****
  
  control_t::control_t() : 
! 	control_m(0), uxtheme_type_m(0), theme_m(theme_default_s), default_window_proc_m(0),
  	child_id_m(0)
  #ifndef NDEBUG
--- 1545,1549 ----
  
  control_t::control_t() : 
! 	control_m(0), default_window_proc_m(0), theme_m(theme_default_s), uxtheme_type_m(0), 
  	child_id_m(0)
  #ifndef NDEBUG
***************
*** 1592,1596 ****
  
  control_t::control_t(const control_t& rhs) : 
! 	control_m(0), uxtheme_type_m(0), theme_m(rhs.theme_m), default_window_proc_m(0),
  	child_id_m(0)
  #ifndef NDEBUG
--- 1594,1598 ----
  
  control_t::control_t(const control_t& rhs) : 
! 	control_m(0), default_window_proc_m(0), theme_m(rhs.theme_m), uxtheme_type_m(0), 
  	child_id_m(0)
  #ifndef NDEBUG
***************
*** 1860,1864 ****
  void control_t::user_hit()
  {
! 	::MessageBeep(-1);
  }
  
--- 1862,1866 ----
  void control_t::user_hit()
  {
! 	::MessageBeep(static_cast<UINT>(-1));
  }
  
***************
*** 2025,2029 ****
  	_super::set_theme(theme);
  
! 	theme_t masked(theme & theme_mask_s);
  }
  
--- 2027,2032 ----
  	_super::set_theme(theme);
  
! 	// currently unused
! 	//  theme_t masked(theme & theme_mask_s);
  }
  
***************
*** 2241,2245 ****
  	assert(control_m);
  
! 	BS_DEFPUSHBUTTON;
  //	set_widget_data(control_m, kControlEntireControl,
  //					kControlPushButtonDefaultTag, Boolean(is_default));
--- 2244,2248 ----
  	assert(control_m);
  
! //	BS_DEFPUSHBUTTON;
  //	set_widget_data(control_m, kControlEntireControl,
  //					kControlPushButtonDefaultTag, Boolean(is_default));
***************
*** 2574,2578 ****
--- 2577,2583 ----
  		draw_link(*link, context);
  
+ #ifndef NDEBUG
  		frame_widget(*control); // Done after the default wind proc has drawn the widget
+ #endif
  	}
  
***************
*** 3028,3032 ****
  	cols_m(rhs.cols_m), scrollable_m(rhs.scrollable_m),
  	edit_baseline_m(rhs.edit_baseline_m), edit_height_m(rhs.edit_height_m),
! 	static_height_m(rhs.static_height_m), static_baseline_m(rhs.static_baseline_m)
  {
  	RECT		bounds = { 0 };
--- 3033,3037 ----
  	cols_m(rhs.cols_m), scrollable_m(rhs.scrollable_m),
  	edit_baseline_m(rhs.edit_baseline_m), edit_height_m(rhs.edit_height_m),
! 	static_baseline_m(rhs.static_baseline_m), static_height_m(rhs.static_height_m) 
  {
  	RECT		bounds = { 0 };
***************
*** 3370,3375 ****
  
  popup_t::implementation_t::implementation_t() :
! 	static_disabled_m(false), using_label_m(false), static_baseline_m(0), static_height_m(0),
! 	popup_baseline_m(0), popup_height_m(0)
  {
  }
--- 3375,3380 ----
  
  popup_t::implementation_t::implementation_t() :
! 	static_disabled_m(false), static_baseline_m(0), static_height_m(0),
! 	popup_baseline_m(0), popup_height_m(0), using_label_m(false)
  {
  }
***************
*** 3378,3385 ****
  
  popup_t::implementation_t::implementation_t(const implementation_t& rhs) :
! 	_super(rhs), static_disabled_m(rhs.static_disabled_m),
! 	using_label_m(rhs.using_label_m), name_m(rhs.name_m),
  	static_baseline_m(rhs.static_baseline_m), static_height_m(rhs.static_height_m),
! 	popup_baseline_m(rhs.popup_baseline_m), popup_height_m(rhs.popup_height_m)
  {
  	RECT		bounds = { 0 };
--- 3383,3390 ----
  
  popup_t::implementation_t::implementation_t(const implementation_t& rhs) :
! 	_super(rhs), name_m(rhs.name_m), static_disabled_m(rhs.static_disabled_m),
  	static_baseline_m(rhs.static_baseline_m), static_height_m(rhs.static_height_m),
! 	popup_baseline_m(rhs.popup_baseline_m), popup_height_m(rhs.popup_height_m),
! 	using_label_m(rhs.using_label_m)
  {
  	RECT		bounds = { 0 };
***************
*** 3487,3491 ****
  	{
  		RECT text = { 0, 0, 0, 0 };
! 		RECT size = { 0, 0, 0, 0 };
  		WINDOWINFO wi = { 0 };
  		wi.cbSize = sizeof(wi);
--- 3492,3497 ----
  	{
  		RECT text = { 0, 0, 0, 0 };
! 		// currently unused
! 		//  RECT size = { 0, 0, 0, 0 };
  		WINDOWINFO wi = { 0 };
  		wi.cbSize = sizeof(wi);
***************
*** 4073,4076 ****
--- 4079,4083 ----
  			case slider_points_down_s:	win32_style |= TBS_BOTTOM;	break;
  			case slider_points_right_s:	win32_style |= TBS_RIGHT;	break;
+ 			default: break; // silences a GCC warning
  		}
  	}
***************
*** 4386,4393 ****
  	assert(window);
  
  	RECT one_bounds = { 0, 0, 1, 1 };
  	RECT global_bounds;
  
- #if 0
  	static ControlUserPaneDrawUPP	draw_handler(::NewControlUserPaneDrawUPP(draw_hitless));
  
--- 4393,4400 ----
  	assert(window);
  
+ #if 0
  	RECT one_bounds = { 0, 0, 1, 1 };
  	RECT global_bounds;
  
  	static ControlUserPaneDrawUPP	draw_handler(::NewControlUserPaneDrawUPP(draw_hitless));
  
***************
*** 4437,4443 ****
  void hitless_t::implementation_t::overlay_bounds_update()
  {
  	RECT		overlay_bounds = { 0 };
  	RECT		hosting_bounds = { 0 };
! #if 0
  	WindowClass	host_window_class(0);
  
--- 4444,4451 ----
  void hitless_t::implementation_t::overlay_bounds_update()
  {
+ #if 0
  	RECT		overlay_bounds = { 0 };
  	RECT		hosting_bounds = { 0 };
! 
  	WindowClass	host_window_class(0);

[adobe-source-commits] sandbox/adobe-source/adobe/test/visual/sources/win ui_core_implementation.cpp

[adobe-source-commits] sandbox/adobe-source/adobe/test/visual/sources/win ui_core_implementation.cpp,1.17,1.18