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

[Ralph T. <ra...@us...>]

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

Modified Files:
	ui_core_implementation.cpp 
Log Message:
We no longer need to override the window procedure unless we want to draw the frame markers, this also means that user_references, etc are not required any more. Additionally I have removed a few lines from the container window procedure which were no longer required (as they were dealing with keyboard events which are already handled in the main message pump).

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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ui_core_implementation.cpp	5 Apr 2005 05:46:05 -0000	1.10
--- ui_core_implementation.cpp	5 Apr 2005 06:16:18 -0000	1.11
***************
*** 1376,1387 ****
  	if (control && message == WM_PAINT) frame_widget(*control);
  #endif
- 	//
- 	// Handle modifier keys here also.
- 	//
- 	if (message == WM_KEYDOWN || message == WM_KEYUP)
- 	{
- 		bool handled(false);
- 		forward_events_to_control(message, wParam, lParam, handled);
- 	}
  	return result;
  }
--- 1376,1379 ----
***************
*** 1400,1404 ****
  	// we don't assume that forward_events_to_control handles the event.
  	//
! 	if ((control->child_id_m != child_id) || (message == WM_KEYDOWN) || (message == WM_KEYUP))
  	{
  		bool handled(false);
--- 1392,1396 ----
  	// we don't assume that forward_events_to_control handles the event.
  	//
! 	if (control->child_id_m != child_id)
  	{
  		bool handled(false);
***************
*** 1871,1878 ****
  
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
! 
  	set_user_reference(control_m, this);
- 
  	trap_window_proc(control_window_proc);
  
  	for (; first != last; ++first)
--- 1863,1870 ----
  
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
! #ifdef NDEBUG
  	set_user_reference(control_m, this);
  	trap_window_proc(control_window_proc);
+ #endif
  
  	for (; first != last; ++first)
***************
*** 2107,2113 ****
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
  
  	set_user_reference(control_m, this);
- 
  	trap_window_proc(control_window_proc);
  }
  
--- 2099,2106 ----
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
  
+ #ifdef NDEBUG
  	set_user_reference(control_m, this);
  	trap_window_proc(control_window_proc);
+ #endif
  }
  
***************
*** 2259,2266 ****
  
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
! 
  	set_user_reference(control_m, this);
- 
  	trap_window_proc(control_window_proc);
  }
  
--- 2252,2259 ----
  
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
! #ifdef NDEBUG
  	set_user_reference(control_m, this);
  	trap_window_proc(control_window_proc);
+ #endif
  }
  
***************
*** 2354,2361 ****
  
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
! 
  	set_user_reference(control_m, this);
- 
  	trap_window_proc(control_window_proc);
  }
  
--- 2347,2354 ----
  
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
! #ifdef NDEBUG
  	set_user_reference(control_m, this);
  	trap_window_proc(control_window_proc);
+ #endif
  }
  
***************
*** 2792,2799 ****
  
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
! 
  	set_user_reference(control_m, this);
- 
  	trap_window_proc(control_window_proc);
  }
  
--- 2785,2792 ----
  
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
! #ifdef NDEBUG
  	set_user_reference(control_m, this);
  	trap_window_proc(control_window_proc);
+ #endif
  }
  
***************
*** 2956,2960 ****
  
  	set_user_reference(control_m, this);
- 
  	trap_window_proc(edit_text_window_proc);
  
--- 2949,2952 ----
***************
*** 3279,3285 ****
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
  
  	set_user_reference(control_m, this);
- 
  	trap_window_proc(control_window_proc);
  
  	clear_menu_items();
--- 3271,3278 ----
  	if (control_m == NULL) ADOBE_THROW_LAST_ERROR;
  
+ #ifdef NDEBUG
  	set_user_reference(control_m, this);
  	trap_window_proc(control_window_proc);
+ #endif
  
  	clear_menu_items();