From 301db575de09b109eec22a1432c6639990ddef5d Mon Sep 17 00:00:00 2001
From: Rachel Hestilow <hestilow@mono-cvs.ximian.com>
Date: Sat, 21 Sep 2002 14:21:15 +0000
Subject: [PATCH] 2002-09-21  Rachel Hestilow  <hestilow@ximian.com>

	* parser/gapi2xml.pl: Adjust enum regex to allow negative values.

svn path=/trunk/gtk-sharp/; revision=7683
---
 ChangeLog          |  4 ++++
 api/gdk-api.xml    | 12 ++++++------
 api/gtk-api.xml    | 22 +++++++++++-----------
 parser/gapi2xml.pl |  2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d35951038..93d1ea834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-21  Rachel Hestilow  <hestilow@ximian.com>
+	
+	* parser/gapi2xml.pl: Adjust enum regex to allow negative values. 
+
 2002-09-16  Martin Baulig  <martin@gnome.org>
 
 	* gnome/Modules.cs (Module): Make this class public.
diff --git a/api/gdk-api.xml b/api/gdk-api.xml
index 3af9ca56d..59e6d31d6 100644
--- a/api/gdk-api.xml
+++ b/api/gdk-api.xml
@@ -105,7 +105,7 @@
       <member cname="GDK_WATCH" name="Watch" value="150"/>
       <member cname="GDK_XTERM" name="Xterm" value="152"/>
       <member cname="GDK_LAST_CURSOR" name="LastCursor"/>
-      <member cname="GDK_CURSOR_IS_PIXMAP" name="CursorIsPixmap"/>
+      <member cname="GDK_CURSOR_IS_PIXMAP" name="CursorIsPixmap" value="-1"/>
     </enum>
     <enum name="DragAction" cname="GdkDragAction" type="flags">
       <member cname="GDK_ACTION_DEFAULT" name="Default" value="1 &lt;&lt; 0"/>
@@ -148,7 +148,7 @@
       <member cname="GDK_ALL_EVENTS_MASK" name="AllEventsMask" value="0x3FFFFE"/>
     </enum>
     <enum name="EventType" cname="GdkEventType" type="enum">
-      <member cname="GDK_NOTHING" name="Nothing"/>
+      <member cname="GDK_NOTHING" name="Nothing" value="-1"/>
       <member cname="GDK_DELETE" name="Delete"/>
       <member cname="GDK_DESTROY" name="Destroy" value="1"/>
       <member cname="GDK_EXPOSE" name="Expose" value="2"/>
@@ -349,10 +349,10 @@
     </enum>
     <enum name="Status" cname="GdkStatus" type="enum">
       <member cname="GDK_OK" name="Ok"/>
-      <member cname="GDK_ERROR" name="Error"/>
-      <member cname="GDK_ERROR_PARAM" name="ErrorParam"/>
-      <member cname="GDK_ERROR_FILE" name="ErrorFile"/>
-      <member cname="GDK_ERROR_MEM" name="ErrorMem"/>
+      <member cname="GDK_ERROR" name="Error" value="-1"/>
+      <member cname="GDK_ERROR_PARAM" name="ErrorParam" value="-2"/>
+      <member cname="GDK_ERROR_FILE" name="ErrorFile" value="-3"/>
+      <member cname="GDK_ERROR_MEM" name="ErrorMem" value="-4"/>
     </enum>
     <enum name="SubwindowMode" cname="GdkSubwindowMode" type="enum">
       <member cname="GDK_CLIP_BY_CHILDREN" name="ClipByChildren"/>
diff --git a/api/gtk-api.xml b/api/gtk-api.xml
index 59efa5c05..23b983643 100644
--- a/api/gtk-api.xml
+++ b/api/gtk-api.xml
@@ -293,17 +293,17 @@
       <member cname="GTK_RESIZE_IMMEDIATE" name="Immediate"/>
     </enum>
     <enum name="ResponseType" cname="GtkResponseType" type="enum">
-      <member cname="GTK_RESPONSE_NONE" name="None"/>
-      <member cname="GTK_RESPONSE_REJECT" name="Reject"/>
-      <member cname="GTK_RESPONSE_ACCEPT" name="Accept"/>
-      <member cname="GTK_RESPONSE_DELETE_EVENT" name="DeleteEvent"/>
-      <member cname="GTK_RESPONSE_OK" name="Ok"/>
-      <member cname="GTK_RESPONSE_CANCEL" name="Cancel"/>
-      <member cname="GTK_RESPONSE_CLOSE" name="Close"/>
-      <member cname="GTK_RESPONSE_YES" name="Yes"/>
-      <member cname="GTK_RESPONSE_NO" name="No"/>
-      <member cname="GTK_RESPONSE_APPLY" name="Apply"/>
-      <member cname="GTK_RESPONSE_HELP" name="Help"/>
+      <member cname="GTK_RESPONSE_NONE" name="None" value="-1"/>
+      <member cname="GTK_RESPONSE_REJECT" name="Reject" value="-2"/>
+      <member cname="GTK_RESPONSE_ACCEPT" name="Accept" value="-3"/>
+      <member cname="GTK_RESPONSE_DELETE_EVENT" name="DeleteEvent" value="-4"/>
+      <member cname="GTK_RESPONSE_OK" name="Ok" value="-5"/>
+      <member cname="GTK_RESPONSE_CANCEL" name="Cancel" value="-6"/>
+      <member cname="GTK_RESPONSE_CLOSE" name="Close" value="-7"/>
+      <member cname="GTK_RESPONSE_YES" name="Yes" value="-8"/>
+      <member cname="GTK_RESPONSE_NO" name="No" value="-9"/>
+      <member cname="GTK_RESPONSE_APPLY" name="Apply" value="-10"/>
+      <member cname="GTK_RESPONSE_HELP" name="Help" value="-11"/>
     </enum>
     <enum name="ScrollType" cname="GtkScrollType" type="enum">
       <member cname="GTK_SCROLL_NONE" name="None"/>
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 919093f32..7ff05668f 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -181,7 +181,7 @@ foreach $cname (sort(keys(%edefs))) {
 	}
 	
 	foreach $val (@vals) {
-		if ($val =~ /$common\_(\w+)\s*=\s*(\d+.*)/) {
+		if ($val =~ /$common\_(\w+)\s*=\s*(\-?\d+.*)/) {
 			$name = $1;
 			if ($2 =~ /1u?\s*<<\s*(\d+)/) {
 				$enumval = "1 << $1";