plib-cvs

[Sebastian U. <ud...@us...>]

Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv28192

Modified Files:
	pu.h pu.cxx 
Log Message:
Undo of accidential merge

Index: pu.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- pu.h	20 Jun 2002 20:07:54 -0000	1.107
+++ pu.h	20 Jun 2002 20:14:01 -0000	1.108
@@ -50,7 +50,6 @@
 
 #ifdef PU_NOT_USING_GLUT
 
-#define PU_NOBUTTON            -1
 #define PU_LEFT_BUTTON          0
 #define PU_MIDDLE_BUTTON        1
 #define PU_RIGHT_BUTTON         2
@@ -59,7 +58,6 @@
 
 #else
 
-#define PU_NOBUTTON         -1
 #define PU_LEFT_BUTTON      GLUT_LEFT_BUTTON
 #define PU_MIDDLE_BUTTON    GLUT_MIDDLE_BUTTON
 #define PU_RIGHT_BUTTON     GLUT_RIGHT_BUTTON

Index: pu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- pu.cxx	20 Jun 2002 20:07:54 -0000	1.51
+++ pu.cxx	20 Jun 2002 20:14:01 -0000	1.52
@@ -360,8 +360,6 @@
   else
     last_buttons &= ~( 1 << button ) ;
 
-printf ( "last_buttons: %d\n", last_buttons ) ;
-
   pu_mouse_x = x ;
   pu_mouse_y = h - y ;
   int return_value =  puGetBaseLiveInterface () -> checkHit ( button,
@@ -400,9 +398,7 @@
   int button =
     (last_buttons & (1<<PU_LEFT_BUTTON  )) ?  PU_LEFT_BUTTON   :
     (last_buttons & (1<<PU_MIDDLE_BUTTON)) ?  PU_MIDDLE_BUTTON :
-    (last_buttons & (1<<PU_RIGHT_BUTTON )) ?  PU_RIGHT_BUTTON  : PU_NOBUTTON ;
-
-printf ( "%d\n", button ) ;
+    (last_buttons & (1<<PU_RIGHT_BUTTON )) ?  PU_RIGHT_BUTTON  : 0 ;
 
   int h = puGetWindowHeight () ;