573d572
<     this->State = vtkBoxWidget::Moving;
577a577,594
> 
>        // Determine the actual state that the widget is now in.
>        if ( this->RotationEnabled && ( this->CurrentHandle == this->HexFace || !this->ScalingEnabled ) )
>          {
>          this->State = vtkBoxWidget::Rotating;
>          }
>        else if ( this->TranslationEnabled && this->CurrentHandle == this->Handle[6] )
>          {
>          this->State = vtkBoxWidget::Moving;
>          }
>        else if ( this->ScalingEnabled )
>          {
>          this->State = this->TranslationEnabled ? vtkBoxWidget::NonUniformScaling : vtkBoxWidget::UniformScaling;
>          }
>        else
>          {
>          this->State = vtkBoxWidget::Nothing;
>          }
585d601
<       this->State = vtkBoxWidget::Moving;
591a608
>            this->State = this->RotationEnabled ? vtkBoxWidget::Rotating : vtkBoxWidget::Nothing;
596a614
>            this->State = this->TranslationEnabled ? vtkBoxWidget::Moving : vtkBoxWidget::Nothing;
719c737
<     this->State = vtkBoxWidget::Scaling;
---
>        this->State = vtkBoxWidget::UniformScaling;
730c748
<       this->State = vtkBoxWidget::Scaling;
---
>          this->State = vtkBoxWidget::UniformScaling;
798,803c816
<   if ( this->State == vtkBoxWidget::Moving )
<     {
<     // Okay to process
<     if ( this->CurrentHandle )
<       {
<       if ( this->RotationEnabled && this->CurrentHandle == this->HexFace )
---
>      if ( this->State == vtkBoxWidget::Rotating )
808c821
<       else if ( this->TranslationEnabled && this->CurrentHandle == this->Handle[6] )
---
>      else if ( this->State == vtkBoxWidget::Moving )
812c825
<       else if ( this->TranslationEnabled && this->ScalingEnabled ) 
---
>      else if ( this->State == vtkBoxWidget::NonUniformScaling )
839,841c852
<       }
<     }
<   else if ( this->ScalingEnabled && this->State == vtkBoxWidget::Scaling )
---
>      else if ( this->State == vtkBoxWidget::UniformScaling )