From 5be8e74890a0e748250d5a2883bc66ea0465c76f Mon Sep 17 00:00:00 2001
From: CaS <CaS@72102866-910b-0410-8b05-ffd578937521>
Date: Sat, 2 Mar 2002 09:38:17 +0000
Subject: [PATCH] Implement buttonNumber

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12950 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                     | 2 +-
 Headers/gnustep/gui/NSEvent.h | 3 ++-
 Source/NSEvent.m              | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba1969eff..4de1d0d3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
 	* Headers/AppKit/NSEvent.h: Rename 'middle' mouse to 'other' as
 	MacOS-X has caught up with the functionality but not adopted our
-	names.
+	names.  Add -buttonNumber
 	* Headers/AppKit/NSResponder.h: ditto
 	* Source/Functions.m: ditto
 	* Source/GSComboSupport.m: ditto
diff --git a/Headers/gnustep/gui/NSEvent.h b/Headers/gnustep/gui/NSEvent.h
index e67d98322..79f682407 100644
--- a/Headers/gnustep/gui/NSEvent.h
+++ b/Headers/gnustep/gui/NSEvent.h
@@ -114,7 +114,8 @@ enum {
       struct
 	{
 	  int	        event_num;
-	  int	        click;
+	  short	        click;
+	  short	        button;
 	  float	        pressure;
 	} mouse;
       struct
diff --git a/Source/NSEvent.m b/Source/NSEvent.m
index 2fa3b1efd..d3e75e868 100644
--- a/Source/NSEvent.m
+++ b/Source/NSEvent.m
@@ -444,7 +444,7 @@ static Class eventClass;
 /*
  * Getting Mouse Event Information
  */
-+ (NSPoint)mouseLocation
++ (NSPoint) mouseLocation
 {
   float x, y;
 
@@ -454,8 +454,10 @@ static Class eventClass;
 
 - (int) buttonNumber
 {
-  /* FIXME */
-  return 0;
+  if (event_type < NSLeftMouseDown || event_type > NSMouseExited)
+    [NSException raise: NSInvalidArgumentException
+		format: @"buttonNumber requested for non-mouse event"];
+  return event_data.mouse.button;
 }
 
 - (int) clickCount