From: Anders R. <ma...@us...> - 2005-11-07 22:11:01
|
Update of /cvsroot/planeshift/planeshift/src/common/paws In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24249/src/common/paws Modified Files: pawsmanager.cpp Log Message: Pushing a button in a Modal Dialog caused a number of warnings from FindWidget to be printed, that realy wasn't a error situation. Changed FindWidget to be silent when called from ModalDialog handing. Index: pawsmanager.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsmanager.cpp,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** pawsmanager.cpp 31 Oct 2005 03:49:57 -0000 1.77 --- pawsmanager.cpp 7 Nov 2005 22:10:52 -0000 1.78 *************** *** 253,257 **** if ( modalWidget != NULL ) { ! pawsWidget* check = modalWidget->FindWidget( widget->GetName() ); if ( check != widget ) { --- 253,260 ---- if ( modalWidget != NULL ) { ! // Check to see if the widget is a child of the modal widget. ! // These are the only components allowed access durning modal ! // mode ! pawsWidget* check = modalWidget->FindWidget( widget->GetName(), false ); if ( check != widget ) { *************** *** 390,396 **** // These are the only components allowed access durning modal // mode ! pawsWidget* check = modalWidget->FindWidget( widget->GetName() ); if ( check != widget ) widget = modalWidget->WidgetAt(event.x, event.y); } --- 393,401 ---- // These are the only components allowed access durning modal // mode ! pawsWidget* check = modalWidget->FindWidget( widget->GetName(), false ); if ( check != widget ) + { widget = modalWidget->WidgetAt(event.x, event.y); + } } *************** *** 765,769 **** { // Allow widget to be focused if it is a child of the modal widget ! pawsWidget* check = modalWidget->FindWidget( widget->GetName() ); if (check) if ( currentFocusedWidget != widget ) --- 770,774 ---- { // Allow widget to be focused if it is a child of the modal widget ! pawsWidget* check = modalWidget->FindWidget( widget->GetName(), false ); if (check) if ( currentFocusedWidget != widget ) |