[Planeshift-cvs] CVS: planeshift/src/common/paws pawslistbox.cpp,1.41,1.42 pawstextbox.cpp,1.45,1.46 pawstree.cpp,1.25,1.26

[Andrew R. <aar...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/paws
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16418/src/common/paws

Modified Files:
	pawslistbox.cpp pawstextbox.cpp pawstree.cpp 
Log Message:
- Effect fixes
- EEdit fixes
- Added a target effect.
- Fixed mouse wheel.
- PAWS fixes.


Index: pawslistbox.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawslistbox.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** pawslistbox.cpp	16 Dec 2004 21:04:09 -0000	1.41
--- pawslistbox.cpp	23 Dec 2004 19:33:19 -0000	1.42
***************
*** 23,26 ****
--- 23,27 ----
  #include <csutil/xmltiny.h>
  #include <iutil/virtclk.h>
+ #include <iutil/event.h>
  #include "pawslistbox.h"
  #include "pawsmanager.h"
***************
*** 640,649 ****
  bool pawsListBox::OnMouseDown(int button, int modifiers, int x, int y )
  {
!     if (button == 4)
      {
          if (scrollBar)
              scrollBar->SetCurrentValue(scrollBar->GetCurrentValue() - LISTBOX_MOUSE_SCROLL_AMOUNT);
      }
!     else if (button == 5)
      {
          if (scrollBar)
--- 641,650 ----
  bool pawsListBox::OnMouseDown(int button, int modifiers, int x, int y )
  {
!     if (button == csmbWheelUp)
      {
          if (scrollBar)
              scrollBar->SetCurrentValue(scrollBar->GetCurrentValue() - LISTBOX_MOUSE_SCROLL_AMOUNT);
      }
!     else if (button == csmbWheelDown)
      {
          if (scrollBar)
***************
*** 1060,1064 ****
  
      // mouse wheel
!     if (button == 4 || button == 5)
      {
          return parentBox->OnMouseDown(button, modifiers, x, y);
--- 1061,1065 ----
  
      // mouse wheel
!     if (button == csmbWheelUp || button == csmbWheelDown)
      {
          return parentBox->OnMouseDown(button, modifiers, x, y);

Index: pawstextbox.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawstextbox.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** pawstextbox.cpp	21 Dec 2004 18:21:51 -0000	1.45
--- pawstextbox.cpp	23 Dec 2004 19:33:19 -0000	1.46
***************
*** 25,28 ****
--- 25,29 ----
  #include <iutil/virtclk.h>
  #include <iutil/evdefs.h>
+ #include <iutil/event.h>
  
  #include "pawstextbox.h"
***************
*** 561,565 ****
  bool pawsMessageTextBox::OnMouseDown( int button, int modifiers, int x, int y )
  {
!     if (button == 4)
      {
          if (scrollBar)
--- 562,566 ----
  bool pawsMessageTextBox::OnMouseDown( int button, int modifiers, int x, int y )
  {
!     if (button == csmbWheelUp)
      {
          if (scrollBar)
***************
*** 567,571 ****
          return true;
      }
!     else if (button == 5)
      {
          if (scrollBar)
--- 568,572 ----
          return true;
      }
!     else if (button == csmbWheelDown)
      {
          if (scrollBar)
***************
*** 1100,1104 ****
  bool pawsEditTextBox::OnMouseDown( int button, int modifiers, int x, int y )
  {
!     if (button == 4)
      {
          if (vScrollBar)
--- 1101,1105 ----
  bool pawsEditTextBox::OnMouseDown( int button, int modifiers, int x, int y )
  {
!     if (button == csmbWheelUp)
      {
          if (vScrollBar)
***************
*** 1106,1110 ****
          return true;
      }
!     else if (button == 5)
      {
          if (vScrollBar)
--- 1107,1111 ----
          return true;
      }
!     else if (button == csmbWheelDown)
      {
          if (vScrollBar)
***************
*** 1436,1440 ****
  bool pawsMultiLineTextBox::OnMouseDown( int button, int modifiers, int x, int y )
  {
!     if (button == 4)
      {
          if (scrollBar)
--- 1437,1441 ----
  bool pawsMultiLineTextBox::OnMouseDown( int button, int modifiers, int x, int y )
  {
!     if (button == csmbWheelUp)
      {
          if (scrollBar)
***************
*** 1442,1446 ****
          return true;
      }
!     else if (button == 5)
      {
          if (scrollBar)
--- 1443,1447 ----
          return true;
      }
!     else if (button == csmbWheelDown)
      {
          if (scrollBar)

Index: pawstree.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawstree.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** pawstree.cpp	21 Dec 2004 16:23:50 -0000	1.25
--- pawstree.cpp	23 Dec 2004 19:33:19 -0000	1.26
***************
*** 21,24 ****
--- 21,25 ----
  #include <psconfig.h>
  #include <csgfx/rgbpixel.h>
+ #include <iutil/event.h>
  
  // COMMON INCLUDES
***************
*** 1137,1141 ****
  bool pawsTree::OnMouseDown(int button, int modifiers, int x, int y)
  {
!     if (button == 4)
      {
          if (vertScrollBar)
--- 1138,1142 ----
  bool pawsTree::OnMouseDown(int button, int modifiers, int x, int y)
  {
!     if (button == csmbWheelUp)
      {
          if (vertScrollBar)
***************
*** 1143,1147 ****
          return true;
      }
!     else if (button == 5)
      {
          if (vertScrollBar)
--- 1144,1148 ----
          return true;
      }
!     else if (button == csmbWheelDown)
      {
          if (vertScrollBar)