From ba4b11a21b50a48f1dca87fc14441488b03f9487 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Wed, 22 Dec 2004 19:12:15 +0000 Subject: [PATCH] 2004-12-22 Mike Kestner * gdk/gdk-api.raw : update enum values. * gnome/gnome-api.raw : update enum values. * gtk/gtk-api.raw : update enum values. * pango/pango-api.raw : update enum values. * parser/gapi2xml.pl : pull whitespace out of enum prefixing logic. [Fixes #70593] svn path=/trunk/gtk-sharp/; revision=38051 --- ChangeLog | 9 ++ doc/ChangeLog | 4 + doc/en/Gdk/FontType.xml | 54 ++++---- doc/en/Gnome/FontPickerMode.xml | 16 +-- doc/en/Gtk/ArgFlags.xml | 133 +++++++++---------- doc/en/Gtk/MatchType.xml | 158 +++++++++++------------ doc/en/Gtk/PreviewType.xml | 54 ++++---- doc/en/Gtk/SideType.xml | 111 ++++++++-------- doc/en/Gtk/SignalRunType.xml | 162 ++++++++++++----------- doc/en/Gtk/SubmenuDirection.xml | 54 ++++---- doc/en/Gtk/SubmenuPlacement.xml | 54 ++++---- doc/en/Gtk/ToolbarChildType.xml | 30 ++--- doc/en/Pango/Script.xml | 222 ++++++++++++++++---------------- gdk/gdk-api.raw | 4 +- gnome/gnome-api.raw | 8 +- gtk/gtk-api.raw | 64 ++++----- pango/pango-api.raw | 110 ++++++++-------- parser/gapi2xml.pl | 1 + 18 files changed, 637 insertions(+), 611 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8068a75ca..03c2d1cbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-12-22 Mike Kestner + + * gdk/gdk-api.raw : update enum values. + * gnome/gnome-api.raw : update enum values. + * gtk/gtk-api.raw : update enum values. + * pango/pango-api.raw : update enum values. + * parser/gapi2xml.pl : pull whitespace out of enum prefixing logic. + [Fixes #70593] + 2004-12-21 Mike Kestner * glib/Argv.cs : argv marshaling class. diff --git a/doc/ChangeLog b/doc/ChangeLog index 1e2f1f88d..776b0cda5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2004-12-21 Mike Kestner + + * *.xml : fix some bad enum value docs. + 2004-12-21 Dan Winship * en/Gtk/CheckMenuItem.xml (EmitToggled): document diff --git a/doc/en/Gdk/FontType.xml b/doc/en/Gdk/FontType.xml index d976c87b9..62400ed05 100644 --- a/doc/en/Gdk/FontType.xml +++ b/doc/en/Gdk/FontType.xml @@ -28,32 +28,6 @@ - - - Field - - Gdk.FontType - - - - - To be added - To be added - - - - - Field - - Gdk.FontType - - - - - To be added - To be added - - Field @@ -67,5 +41,31 @@ Do not use. + + + Field + + Gdk.FontType + + + + + Font + + + + + + Field + + Gdk.FontType + + + + + Fontset + + + - \ No newline at end of file + diff --git a/doc/en/Gnome/FontPickerMode.xml b/doc/en/Gnome/FontPickerMode.xml index 530fd77d7..bfa0eb0b3 100644 --- a/doc/en/Gnome/FontPickerMode.xml +++ b/doc/en/Gnome/FontPickerMode.xml @@ -42,8 +42,8 @@ Do not use. - - + + Field Gnome.FontPickerMode @@ -55,8 +55,8 @@ To be added - - + + Field Gnome.FontPickerMode @@ -68,8 +68,8 @@ To be added - - + + Field Gnome.FontPickerMode @@ -81,8 +81,8 @@ To be added - - + + Field Gnome.FontPickerMode diff --git a/doc/en/Gtk/ArgFlags.xml b/doc/en/Gtk/ArgFlags.xml index 14a71435a..40918769a 100644 --- a/doc/en/Gtk/ArgFlags.xml +++ b/doc/en/Gtk/ArgFlags.xml @@ -10,7 +10,8 @@ Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. To be added - + + System.Enum @@ -32,71 +33,6 @@ - - - Field - - Gtk.ArgFlags - - - - - To be added - - - - - - Field - - Gtk.ArgFlags - - - - - To be added - - - - - - Field - - Gtk.ArgFlags - - - - - To be added - - - - - - Field - - Gtk.ArgFlags - - - - - To be added - - - - - - Field - - Gtk.ArgFlags - - - - - To be added - - - Field @@ -110,5 +46,70 @@ Do not use. + + + Field + + Gtk.ArgFlags + + + + + To be added + To be added + + + + + Field + + Gtk.ArgFlags + + + + + To be added + To be added + + + + + Field + + Gtk.ArgFlags + + + + + To be added + To be added + + + + + Field + + Gtk.ArgFlags + + + + + To be added + To be added + + + + + Field + + Gtk.ArgFlags + + + + + To be added + To be added + + diff --git a/doc/en/Gtk/MatchType.xml b/doc/en/Gtk/MatchType.xml index c54a17973..86f959113 100644 --- a/doc/en/Gtk/MatchType.xml +++ b/doc/en/Gtk/MatchType.xml @@ -28,84 +28,6 @@ - - - Field - - Gtk.MatchType - - - - - To be added - To be added - - - - - Field - - Gtk.MatchType - - - - - To be added - To be added - - - - - Field - - Gtk.MatchType - - - - - To be added - To be added - - - - - Field - - Gtk.MatchType - - - - - To be added - To be added - - - - - Field - - Gtk.MatchType - - - - - To be added - To be added - - - - - Field - - Gtk.MatchType - - - - - To be added - To be added - - Field @@ -119,5 +41,83 @@ Do not use. + + + Field + + Gtk.MatchType + + + + + To be added + To be added + + + + + Field + + Gtk.MatchType + + + + + To be added + To be added + + + + + Field + + Gtk.MatchType + + + + + To be added + To be added + + + + + Field + + Gtk.MatchType + + + + + To be added + To be added + + + + + Field + + Gtk.MatchType + + + + + To be added + To be added + + + + + Field + + Gtk.MatchType + + + + + To be added + To be added + + - \ No newline at end of file + diff --git a/doc/en/Gtk/PreviewType.xml b/doc/en/Gtk/PreviewType.xml index d426d08e7..0af1294cc 100644 --- a/doc/en/Gtk/PreviewType.xml +++ b/doc/en/Gtk/PreviewType.xml @@ -28,32 +28,6 @@ - - - Field - - Gtk.PreviewType - - - - - To be added - To be added - - - - - Field - - Gtk.PreviewType - - - - - To be added - To be added - - Field @@ -67,5 +41,31 @@ Do not use. + + + Field + + Gtk.PreviewType + + + + + To be added + To be added + + + + + Field + + Gtk.PreviewType + + + + + To be added + To be added + + - \ No newline at end of file + diff --git a/doc/en/Gtk/SideType.xml b/doc/en/Gtk/SideType.xml index 6cbcaac46..bc4ddb8b4 100644 --- a/doc/en/Gtk/SideType.xml +++ b/doc/en/Gtk/SideType.xml @@ -10,7 +10,8 @@ Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. Gtk.SideType is deprecated and should not be used in newly-written code. - + + System.Enum @@ -28,58 +29,6 @@ - - - Field - - Gtk.SideType - - - - - SideTop - - - - - - Field - - Gtk.SideType - - - - - SideBottom - - - - - - Field - - Gtk.SideType - - - - - SideLeft - - - - - - Field - - Gtk.SideType - - - - - SideRight - - - Field @@ -93,5 +42,61 @@ Do not use. + + + Field + + Gtk.SideType + + + + + SideTop + + + + + + + Field + + Gtk.SideType + + + + + SideBottom + + + + + + + Field + + Gtk.SideType + + + + + SideLeft + + + + + + + Field + + Gtk.SideType + + + + + SideRight + + + + diff --git a/doc/en/Gtk/SignalRunType.xml b/doc/en/Gtk/SignalRunType.xml index 4c2109201..df53988f2 100644 --- a/doc/en/Gtk/SignalRunType.xml +++ b/doc/en/Gtk/SignalRunType.xml @@ -28,84 +28,6 @@ - - - Field - - Gtk.SignalRunType - - - - - Run the default handler before the connected user-defined handlers. - - - - - - Field - - Gtk.SignalRunType - - - - - Run the default handler after the connected user-defined handlers. (Handlers registered as "after" always run after the default handler though) - - - - - - Field - - Gtk.SignalRunType - - - - - Run the default handler twice, once before the user-defined handlers, and once after. - - - - - - Field - - Gtk.SignalRunType - - - - - Whether to prevent a handler or hook from reemitting the signal from within itself. Attempts to emit the signal while it is running will result in the signal emission being restarted once it is done with the current processing. - - - - - - Field - - Gtk.SignalRunType - - - - - The signal is an action you can invoke without any particular setup or cleanup. The signal is treated no differently, but some other code can determine if the signal is appropriate to delegate to user control. For example, key binding sets only allow bindings of ACTION signals to keystrokes. - - - - - - Field - - Gtk.SignalRunType - - - - - This prevents the connection of emission hooks to the signal. - - - Field @@ -119,5 +41,89 @@ Do not use. + + + Field + + Gtk.SignalRunType + + + + + Run the default handler before the connected user-defined handlers. + + + + + + + Field + + Gtk.SignalRunType + + + + + Run the default handler after the connected user-defined handlers. (Handlers registered as "after" always run after the default handler though) + + + + + + + Field + + Gtk.SignalRunType + + + + + Run the default handler twice, once before the user-defined handlers, and once after. + + + + + + + Field + + Gtk.SignalRunType + + + + + Whether to prevent a handler or hook from reemitting the signal from within itself. Attempts to emit the signal while it is running will result in the signal emission being restarted once it is done with the current processing. + + + + + + + Field + + Gtk.SignalRunType + + + + + The signal is an action you can invoke without any particular setup or cleanup. The signal is treated no differently, but some other code can determine if the signal is appropriate to delegate to user control. For example, key binding sets only allow bindings of ACTION signals to keystrokes. + + + + + + + Field + + Gtk.SignalRunType + + + + + This prevents the connection of emission hooks to the signal. + + + + diff --git a/doc/en/Gtk/SubmenuDirection.xml b/doc/en/Gtk/SubmenuDirection.xml index bc45e3767..9b7424337 100644 --- a/doc/en/Gtk/SubmenuDirection.xml +++ b/doc/en/Gtk/SubmenuDirection.xml @@ -10,7 +10,7 @@ Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. Enumeration for direction of submenus. - + System.Enum @@ -28,32 +28,6 @@ - - - Field - - Gtk.SubmenuDirection - - - - - Left direction. - - - - - - Field - - Gtk.SubmenuDirection - - - - - Right direction. - - - Field @@ -67,5 +41,31 @@ Do not use. + + + Field + + Gtk.SubmenuDirection + + + + + Left direction. + + + + + + Field + + Gtk.SubmenuDirection + + + + + Right direction. + + + diff --git a/doc/en/Gtk/SubmenuPlacement.xml b/doc/en/Gtk/SubmenuPlacement.xml index d4abb7fc4..58be122cf 100644 --- a/doc/en/Gtk/SubmenuPlacement.xml +++ b/doc/en/Gtk/SubmenuPlacement.xml @@ -10,7 +10,7 @@ Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. Enumeration for placement of submenus. - + System.Enum @@ -28,32 +28,6 @@ - - - Field - - Gtk.SubmenuPlacement - - - - - Place submenu top-to-bottom. - - - - - - Field - - Gtk.SubmenuPlacement - - - - - Place submenu left-to-right. - - - Field @@ -67,5 +41,31 @@ Do not use. + + + Field + + Gtk.SubmenuPlacement + + + + + Place submenu top-to-bottom. + + + + + + Field + + Gtk.SubmenuPlacement + + + + + Place submenu left-to-right. + + + diff --git a/doc/en/Gtk/ToolbarChildType.xml b/doc/en/Gtk/ToolbarChildType.xml index e8b5ab174..cdb8e3801 100644 --- a/doc/en/Gtk/ToolbarChildType.xml +++ b/doc/en/Gtk/ToolbarChildType.xml @@ -43,8 +43,8 @@ Do not use. - - + + Field Gtk.ToolbarChildType @@ -53,11 +53,11 @@ Add blank space to the toolbar. - + - - + + Field Gtk.ToolbarChildType @@ -66,11 +66,11 @@ Add buttons to the toolbar. - + - - + + Field Gtk.ToolbarChildType @@ -79,11 +79,11 @@ Add toggle buttons to the toolbar. - + - - + + Field Gtk.ToolbarChildType @@ -92,11 +92,11 @@ Add radio buttons to the toolbar. - + - - + + Field Gtk.ToolbarChildType @@ -105,7 +105,7 @@ Add widgets to the toolbar. - + diff --git a/doc/en/Pango/Script.xml b/doc/en/Pango/Script.xml index a1efb5745..1ef1f324a 100644 --- a/doc/en/Pango/Script.xml +++ b/doc/en/Pango/Script.xml @@ -28,8 +28,8 @@ - - + + Field Pango.Script @@ -41,8 +41,8 @@ - - + + Field Pango.Script @@ -54,8 +54,8 @@ - - + + Field Pango.Script @@ -67,8 +67,8 @@ - - + + Field Pango.Script @@ -81,8 +81,8 @@ - - + + Field Pango.Script @@ -95,8 +95,8 @@ - - + + Field Pango.Script @@ -109,8 +109,8 @@ - - + + Field Pango.Script @@ -123,8 +123,8 @@ - - + + Field Pango.Script @@ -137,8 +137,8 @@ - - + + Field Pango.Script @@ -151,8 +151,8 @@ - - + + Field Pango.Script @@ -165,8 +165,8 @@ - - + + Field Pango.Script @@ -179,8 +179,8 @@ - - + + Field Pango.Script @@ -193,8 +193,8 @@ - - + + Field Pango.Script @@ -207,8 +207,8 @@ - - + + Field Pango.Script @@ -221,8 +221,8 @@ - - + + Field Pango.Script @@ -235,8 +235,8 @@ - - + + Field Pango.Script @@ -249,8 +249,8 @@ - - + + Field Pango.Script @@ -263,8 +263,8 @@ - - + + Field Pango.Script @@ -277,8 +277,8 @@ - - + + Field Pango.Script @@ -291,8 +291,8 @@ - - + + Field Pango.Script @@ -305,8 +305,8 @@ - - + + Field Pango.Script @@ -319,8 +319,8 @@ - - + + Field Pango.Script @@ -333,8 +333,8 @@ - - + + Field Pango.Script @@ -347,8 +347,8 @@ - - + + Field Pango.Script @@ -361,8 +361,8 @@ - - + + Field Pango.Script @@ -375,8 +375,8 @@ - - + + Field Pango.Script @@ -389,8 +389,8 @@ - - + + Field Pango.Script @@ -403,8 +403,8 @@ - - + + Field Pango.Script @@ -417,8 +417,8 @@ - - + + Field Pango.Script @@ -431,8 +431,8 @@ - - + + Field Pango.Script @@ -445,8 +445,8 @@ - - + + Field Pango.Script @@ -459,8 +459,8 @@ - - + + Field Pango.Script @@ -473,8 +473,8 @@ - - + + Field Pango.Script @@ -487,8 +487,8 @@ - - + + Field Pango.Script @@ -501,8 +501,8 @@ - - + + Field Pango.Script @@ -515,8 +515,8 @@ - - + + Field Pango.Script @@ -529,8 +529,8 @@ - - + + Field Pango.Script @@ -543,8 +543,8 @@ - - + + Field Pango.Script @@ -557,8 +557,8 @@ - - + + Field Pango.Script @@ -571,8 +571,8 @@ - - + + Field Pango.Script @@ -585,8 +585,8 @@ - - + + Field Pango.Script @@ -599,8 +599,8 @@ - - + + Field Pango.Script @@ -613,8 +613,8 @@ - - + + Field Pango.Script @@ -627,8 +627,8 @@ - - + + Field Pango.Script @@ -641,8 +641,8 @@ - - + + Field Pango.Script @@ -655,8 +655,8 @@ - - + + Field Pango.Script @@ -669,8 +669,8 @@ - - + + Field Pango.Script @@ -683,8 +683,8 @@ - - + + Field Pango.Script @@ -697,8 +697,8 @@ - - + + Field Pango.Script @@ -711,8 +711,8 @@ - - + + Field Pango.Script @@ -725,8 +725,8 @@ - - + + Field Pango.Script @@ -739,8 +739,8 @@ - - + + Field Pango.Script @@ -753,8 +753,8 @@ - - + + Field Pango.Script @@ -767,8 +767,8 @@ - - + + Field Pango.Script @@ -781,8 +781,8 @@ - - + + Field Pango.Script @@ -809,4 +809,4 @@ - \ No newline at end of file + diff --git a/gdk/gdk-api.raw b/gdk/gdk-api.raw index 8a4c1f273..c5bd0f3b7 100644 --- a/gdk/gdk-api.raw +++ b/gdk/gdk-api.raw @@ -212,8 +212,8 @@ - - + + diff --git a/gnome/gnome-api.raw b/gnome/gnome-api.raw index b46114354..bb02f4956 100644 --- a/gnome/gnome-api.raw +++ b/gnome/gnome-api.raw @@ -1787,10 +1787,10 @@ - - - - + + + + diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw index b0d9d5c2a..4b406dc7d 100644 --- a/gtk/gtk-api.raw +++ b/gtk/gtk-api.raw @@ -32,11 +32,11 @@ - - - - - + + + + + @@ -225,12 +225,12 @@ - - - - - - + + + + + + @@ -304,8 +304,8 @@ - - + + @@ -440,18 +440,18 @@ - - - - + + + + - - - - - - + + + + + + @@ -484,12 +484,12 @@ - - + + - - + + @@ -514,11 +514,11 @@ - - - - - + + + + + diff --git a/pango/pango-api.raw b/pango/pango-api.raw index eb7f6ac19..f6bac80b4 100644 --- a/pango/pango-api.raw +++ b/pango/pango-api.raw @@ -55,61 +55,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index 0fdc182c3..3108fa3d7 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -220,6 +220,7 @@ foreach $cname (sort(keys(%edefs))) { } $def =~ /\{(.*)\}/; @vals = split(/,\s*/, $1); + $vals[0] =~ s/^\s+//; @v0 = split(/_/, $vals[0]); if (@vals > 1) { $done = 0;