[Plib-cvs] plib/src/puAux puAuxComboBox.cxx,1.1,1.2 puAuxLargeInput.cxx,1.1,1.2 puAuxSelectBox.cxx,1.1,1.2

[Steve B. <sj...@us...>]

Update of /cvsroot/plib/plib/src/puAux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19225/plib/src/puAux

Modified Files:
	puAuxComboBox.cxx puAuxLargeInput.cxx puAuxSelectBox.cxx 
Log Message:
Added some changes that John Fay requested:

1) Fixed MacOSX joystick code to resemble a fix that was applied to freeglut.
2) Provided a test to prevent some puAux widgets from being incorrectly
   activated on a key release.



Index: puAuxComboBox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/puAux/puAuxComboBox.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- puAuxComboBox.cxx	28 Feb 2004 00:54:03 -0000	1.1
+++ puAuxComboBox.cxx	18 Mar 2004 17:20:52 -0000	1.2
@@ -192,7 +192,8 @@
 
 int puaComboBox::checkKey ( int key, int updown )
 {
-  if ( ! input -> isAcceptingInput () || ! isVisible () || ! isActive () || ( window != puGetWindow () ) )
+  if ( updown == PU_UP || ! input -> isAcceptingInput () ||
+       ! isVisible () || ! isActive () || ( window != puGetWindow () ) )
     return FALSE ;
 
   switch ( key )

Index: puAuxLargeInput.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/puAux/puAuxLargeInput.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- puAuxLargeInput.cxx	28 Feb 2004 00:54:03 -0000	1.1
+++ puAuxLargeInput.cxx	18 Mar 2004 17:20:52 -0000	1.2
@@ -844,9 +844,10 @@
     lowlight () ;
 }
 
-int puaLargeInput::checkKey ( int key, int /* updown */ )
+int puaLargeInput::checkKey ( int key, int updown )
 {
-  if ( !isAcceptingInput () || !isActive () || !isVisible () || ( window != puGetWindow () ) )
+  if ( updown == PU_UP || !isAcceptingInput () || !isActive () ||
+       !isVisible () || ( window != puGetWindow () ) )
     return FALSE ;
 
   if ( puActiveWidget() && ( this != puActiveWidget() ) )

Index: puAuxSelectBox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/puAux/puAuxSelectBox.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- puAuxSelectBox.cxx	28 Feb 2004 00:54:03 -0000	1.1
+++ puAuxSelectBox.cxx	18 Mar 2004 17:20:52 -0000	1.2
@@ -114,7 +114,8 @@
 
 int puaSelectBox::checkKey ( int key, int updown )
 {
-  if ( ! input -> isAcceptingInput () || ! isVisible () || ! isActive () || ( window != puGetWindow () ) )
+  if ( updown == PU_UP || ! input -> isAcceptingInput () ||
+       ! isVisible () || ! isActive () || ( window != puGetWindow () ) )
     return FALSE ;
 
   switch ( key )