[Planeshift-cvs] CVS: planeshift/src/client/paws pspawsmanager.cpp,1.29,1.30

[Andy D. <kha...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/paws
In directory sc8-pr-cvs1:/tmp/cvs-serv25882/src/client/paws

Modified Files:
	pspawsmanager.cpp 
Log Message:
Removed some unneeded ifs

Index: pspawsmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pspawsmanager.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** pspawsmanager.cpp	2 Aug 2003 04:22:47 -0000	1.29
--- pspawsmanager.cpp	5 Aug 2003 14:55:12 -0000	1.30
***************
*** 213,217 ****
          if ( widget != mainWidget )
              widget->GetParent()->BringToTop( widget );
- 
          bool returnResult = widget->OnMouseDown( event.Mouse.Button, 
                                                   event.Mouse.x, 
--- 213,216 ----
***************
*** 288,293 ****
          {
              // Only fade in/out topmost parent
!             for (pawsWidget* mainParent = widget->GetParent();mainParent && mainParent != mainWidget;mainParent=widget->GetParent())
!                 widget = mainParent;
  
              if (widget != mouseoverWidget && widget->IsVisible())
--- 287,293 ----
          {
              // Only fade in/out topmost parent
!             if (widget != mainWidget)
!                 for (pawsWidget* mainParent = widget->GetParent();mainParent != mainWidget;mainParent=widget->GetParent())
!                     widget = mainParent;
  
              if (widget != mouseoverWidget && widget->IsVisible())
***************
*** 427,434 ****
          {
              // Check if widget CAN be focused, if it can't, pass it to the parent
!             for(;!(widget->OnGainFocus()) && widget->GetParent();widget = widget->GetParent())
                  if (widget == currentFocusedWidget) // Abort
                      break;
              if (currentFocusedWidget) currentFocusedWidget->OnLostFocus();
          }   
      
--- 427,435 ----
          {
              // Check if widget CAN be focused, if it can't, pass it to the parent
!             for(;!(widget->OnGainFocus()) && widget != mainWidget;widget = widget->GetParent())
                  if (widget == currentFocusedWidget) // Abort
                      break;
              if (currentFocusedWidget) currentFocusedWidget->OnLostFocus();
+ 
          }   
      
***************
*** 443,447 ****
              {
                  // Check if widget CAN be focused, if it can't, pass it to the parent
!                 for(;!(widget->OnGainFocus()) && widget->GetParent();widget = widget->GetParent())
                      if (widget == currentFocusedWidget) // Abort
                          break;
--- 444,448 ----
              {
                  // Check if widget CAN be focused, if it can't, pass it to the parent
!                 for(;!(widget->OnGainFocus()) && widget != mainWidget;widget = widget->GetParent())
                      if (widget == currentFocusedWidget) // Abort
                          break;
***************
*** 449,456 ****
                  if (currentFocusedWidget) currentFocusedWidget->OnLostFocus();
              }
- 
              currentFocusedWidget = widget; 
      }
- 
  }
  
--- 450,455 ----