From 3c973421cba044b243980446a11ceaf59c6ec7c6 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Thu, 9 Oct 2003 05:54:55 +0000
Subject: [PATCH] 2003-10-09  Mike Kestner  <mkestner@ximian.com>

	* api/*-api.xml : regenerated
	* parser/gapi_pp.pl : ignore simple comments.  [Fixes #47450]
	* parser/gapi2xml.pl : turn off debug.

svn path=/trunk/gtk-sharp/; revision=18794
---
 ChangeLog          |  6 ++++++
 api/gdk-api.xml    |  1 +
 api/gnome-api.xml  | 41 ++++++++++++++++++++++++++---------------
 api/gtk-api.xml    |  8 ++++++--
 parser/gapi2xml.pl |  4 ++--
 parser/gapi_pp.pl  |  3 +++
 6 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b17c82358..4dd387cad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-09  Mike Kestner  <mkestner@ximian.com>
+
+	* api/*-api.xml : regenerated
+	* parser/gapi_pp.pl : ignore simple comments.  [Fixes #47450]
+	* parser/gapi2xml.pl : turn off debug.
+
 2003-10-09  Mike Kestner  <mkestner@ximian.com>
 
         * generator/Property.cs : don't do new for Objects if FromNativeReturn
diff --git a/api/gdk-api.xml b/api/gdk-api.xml
index 4e02b7042..e451c160b 100644
--- a/api/gdk-api.xml
+++ b/api/gdk-api.xml
@@ -125,6 +125,7 @@
       <member cname="GDK_DRAG_PROTO_MOTIF" name="Motif"/>
       <member cname="GDK_DRAG_PROTO_XDND" name="Xdnd"/>
       <member cname="GDK_DRAG_PROTO_ROOTWIN" name="Rootwin"/>
+      <member cname="GDK_DRAG_PROTO_NONE" name="None"/>
       <member cname="GDK_DRAG_PROTO_WIN32_DROPFILES" name="Win32Dropfiles"/>
       <member cname="GDK_DRAG_PROTO_OLE2" name="Ole2"/>
       <member cname="GDK_DRAG_PROTO_LOCAL" name="Local"/>
diff --git a/api/gnome-api.xml b/api/gnome-api.xml
index a942d8f80..3c7012855 100644
--- a/api/gnome-api.xml
+++ b/api/gnome-api.xml
@@ -590,7 +590,7 @@
         <return-type type="gint"/>
         <parameters>
           <parameter type="const-gchar*" name="gamename"/>
-          <parameter type="/*" name="Will"/>
+          <parameter type="const-gchar*" name="level"/>
           <parameter type="gchar***" name="names"/>
           <parameter type="gfloat**" name="scores"/>
           <parameter type="time_t**" name="scoretimes"/>
@@ -3990,6 +3990,17 @@
           <parameter type="gboolean" name="clear"/>
         </parameters>
       </method>
+      <method name="Display" cname="gnome_scores_display" shared="true">
+        <return-type type="GtkWidget*"/>
+        <parameters>
+          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="app_name"/>
+          <parameter type="/*" name="Name"/>
+          <parameter type="as" name="in"/>
+          <parameter type="int" name="pos"/>
+          <parameter type="as" name="returned"/>
+        </parameters>
+      </method>
       <method name="DisplayWithPixmap" cname="gnome_scores_display_with_pixmap" shared="true">
         <return-type type="GtkWidget*"/>
         <parameters>
@@ -4005,17 +4016,17 @@
       <constructor cname="gnome_scores_new">
         <parameters>
           <parameter type="guint" name="n_scores"/>
-          <parameter type="/*" name="Number"/>
-          <parameter type="/*" name="Names"/>
-          <parameter type="/*" name="Scores*"/>
-          <parameter type="/*" name="Time"/>
+          <parameter type="gchar**" name="names"/>
+          <parameter type="gfloat*" name="scores"/>
+          <parameter type="time_t*" name="times"/>
+          <parameter type="gboolean" name="clear"/>
         </parameters>
       </constructor>
       <method name="SetColor" cname="gnome_scores_set_color">
         <return-type type="void"/>
         <parameters>
-          <parameter type="/*" name="GNOME"/>
-          <parameter type="/*" name="Entry"/>
+          <parameter type="guint" name="n"/>
+          <parameter type="GdkColor*" name="col"/>
         </parameters>
       </method>
       <method name="SetColors" cname="gnome_scores_set_colors">
@@ -4027,39 +4038,39 @@
       <method name="SetCurrentPlayer" cname="gnome_scores_set_current_player">
         <return-type type="void"/>
         <parameters>
-          <parameter type="/*" name="GNOME"/>
+          <parameter type="gint" name="i"/>
         </parameters>
       </method>
       <method name="SetDefColor" cname="gnome_scores_set_def_color">
         <return-type type="void"/>
         <parameters>
-          <parameter type="/*" name="GNOME"/>
+          <parameter type="GdkColor*" name="col"/>
         </parameters>
       </method>
       <method name="SetLogoLabel" cname="gnome_scores_set_logo_label">
         <return-type type="void"/>
         <parameters>
-          <parameter type="/*" name="GNOME"/>
-          <parameter type="/*" name="Text"/>
-          <parameter type="/*" name="Font"/>
+          <parameter type="const-gchar*" name="txt"/>
+          <parameter type="const-gchar*" name="font"/>
+          <parameter type="GdkColor*" name="col"/>
         </parameters>
       </method>
       <method name="SetLogoLabelTitle" cname="gnome_scores_set_logo_label_title">
         <return-type type="void"/>
         <parameters>
-          <parameter type="/*" name="GNOME"/>
+          <parameter type="const-gchar*" name="txt"/>
         </parameters>
       </method>
       <method name="SetLogoPixmap" cname="gnome_scores_set_logo_pixmap">
         <return-type type="void"/>
         <parameters>
-          <parameter type="/*" name="GNOME"/>
+          <parameter type="const-gchar*" name="pix_name"/>
         </parameters>
       </method>
       <method name="SetLogoWidget" cname="gnome_scores_set_logo_widget">
         <return-type type="void"/>
         <parameters>
-          <parameter type="/*" name="GNOME"/>
+          <parameter type="GtkWidget*" name="w"/>
         </parameters>
       </method>
     </object>
diff --git a/api/gtk-api.xml b/api/gtk-api.xml
index 71e1c5882..7b553875a 100644
--- a/api/gtk-api.xml
+++ b/api/gtk-api.xml
@@ -99,6 +99,10 @@
     <enum name="DeleteType" cname="GtkDeleteType" type="enum">
       <member cname="GTK_DELETE_CHARS" name="Chars"/>
       <member cname="GTK_DELETE_WORD_ENDS" name="WordEnds"/>
+      <member cname="GTK_DELETE_WORDS" name="Words"/>
+      <member cname="GTK_DELETE_DISPLAY_LINES" name="DisplayLines"/>
+      <member cname="GTK_DELETE_DISPLAY_LINE_ENDS" name="DisplayLineEnds"/>
+      <member cname="GTK_DELETE_PARAGRAPH_ENDS" name="ParagraphEnds"/>
       <member cname="GTK_DELETE_PARAGRAPHS" name="Paragraphs"/>
       <member cname="GTK_DELETE_WHITESPACE" name="Whitespace"/>
     </enum>
@@ -7242,7 +7246,7 @@
         <parameters>
           <parameter type="GtkWidget*" name="child"/>
           <parameter type="GtkTextWindowType" name="which_window"/>
-          <parameter type="/*" name="window"/>
+          <parameter type="gint" name="xpos"/>
           <parameter type="gint" name="ypos"/>
         </parameters>
       </method>
@@ -7381,7 +7385,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkWidget*" name="child"/>
-          <parameter type="/*" name="window"/>
+          <parameter type="gint" name="xpos"/>
           <parameter type="gint" name="ypos"/>
         </parameters>
       </method>
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index e52423cae..fb11d55bf 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -7,7 +7,7 @@
 # <c> 2001-2003 Mike Kestner
 ##############################################################
 
-$debug=1;
+$debug=0;
 
 use XML::LibXML;
 use GAPI::Metadata;
@@ -412,7 +412,7 @@ if ($ARGV[1]) {
 $scnt = keys(%sdefs); $fcnt = keys(%fdefs); $tcnt = keys(%types);
 print "structs: $scnt  enums: $ecnt  callbacks: $cbcnt\n";
 print "funcs: $fcnt types: $tcnt  classes: $classcnt\n";
-print "props: $propcnt signals: $sigcnt\n";
+print "props: $propcnt signals: $sigcnt\n\n";
 
 sub addFieldElems
 {
diff --git a/parser/gapi_pp.pl b/parser/gapi_pp.pl
index 86c239d55..939c7bd9e 100755
--- a/parser/gapi_pp.pl
+++ b/parser/gapi_pp.pl
@@ -32,6 +32,9 @@ foreach $fname (@hdrs) {
 		$braces-- if ($line =~ /}/ and $line !~ /{/);
 		
 		next if ($line =~ /$ignoreit_regex/);
+
+		$line =~ s/\/\*.*?\*\///g;
+
 		next if ($line !~ /\S/);
 
 		$line = $prepend . $line;