From 05ddfae8dcbfc143b6eed696c90e9404bd09a813 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 23 Feb 2005 20:16:40 +0000 Subject: [PATCH] * parser/gapi2xml.pl (parseTypeToken): don't parse punctuation into the type name * gtk/gtk-api.raw: Regen, exposing the previously-broken AccelGroup.AccelActivate, AccelMap.Changed, ActionGroup.ConnectProxy, ActionGroup.DisconnectProxy, ActionGroup.PreActivate, ActionGroup.PostActivate, and Widget.EventAfter. * gtk/Gtk.metadata: Give proper names to the parameters of those signals svn path=/trunk/gtk-sharp/; revision=41111 --- ChangeLog | 14 +++ doc/ChangeLog | 12 +++ doc/en/Gtk/AccelActivateArgs.xml | 74 ++++++++++++++ doc/en/Gtk/AccelActivateHandler.xml | 39 ++++++++ doc/en/Gtk/AccelGroup.xml | 37 ++++++- doc/en/Gtk/AccelMap.xml | 133 ++++++++++++++++--------- doc/en/Gtk/ActionGroup.xml | 114 ++++++++++++++++++++- doc/en/Gtk/MapChangedArgs.xml | 74 ++++++++++++++ doc/en/Gtk/MapChangedHandler.xml | 39 ++++++++ doc/en/Gtk/Widget.xml | 26 +++++ doc/en/Gtk/WidgetEventAfterArgs.xml | 48 +++++++++ doc/en/Gtk/WidgetEventAfterHandler.xml | 39 ++++++++ gtk/Gtk.metadata | 22 ++++ gtk/gtk-api.raw | 14 +-- parser/gapi2xml.pl | 2 +- 15 files changed, 628 insertions(+), 59 deletions(-) create mode 100644 doc/en/Gtk/AccelActivateArgs.xml create mode 100644 doc/en/Gtk/AccelActivateHandler.xml create mode 100644 doc/en/Gtk/MapChangedArgs.xml create mode 100644 doc/en/Gtk/MapChangedHandler.xml create mode 100644 doc/en/Gtk/WidgetEventAfterArgs.xml create mode 100644 doc/en/Gtk/WidgetEventAfterHandler.xml diff --git a/ChangeLog b/ChangeLog index 4b8aa0be8..61d1150af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-02-23 Dan Winship + + * parser/gapi2xml.pl (parseTypeToken): don't parse punctuation + into the type name + + * gtk/gtk-api.raw: Regen, exposing the previously-broken + AccelGroup.AccelActivate, AccelMap.Changed, + ActionGroup.ConnectProxy, ActionGroup.DisconnectProxy, + ActionGroup.PreActivate, ActionGroup.PostActivate, and + Widget.EventAfter. + + * gtk/Gtk.metadata: Give proper names to the parameters of those + signals + 2005-02-17 Dan Winship * generator/Field.cs (Validate): new, to check that a field has a diff --git a/doc/ChangeLog b/doc/ChangeLog index 72efd6940..7f70f658b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,17 @@ 2005-02-23 Dan Winship + * en/Gtk/AccelActivateArgs.xml: + * en/Gtk/AccelActivateHandler.xml: + * en/Gtk/AccelGroup.xml: + * en/Gtk/AccelMap.xml: + * en/Gtk/ActionGroup.xml: + * en/Gtk/MapChangedArgs.xml: + * en/Gtk/MapChangedHandler.xml: + * en/Gtk/Widget.xml: + * en/Gtk/WidgetEventAfterArgs.xml: + * en/Gtk/WidgetEventAfterHandler.xml: document newly exposed + signals, args, handlers + * en/Gda/*xml: rototilled by parser changes 2005-02-18 Mike Kestner diff --git a/doc/en/Gtk/AccelActivateArgs.xml b/doc/en/Gtk/AccelActivateArgs.xml new file mode 100644 index 000000000..236923d9f --- /dev/null +++ b/doc/en/Gtk/AccelActivateArgs.xml @@ -0,0 +1,74 @@ + + + + gtk-sharp + [00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4] + 2.0.0.0 + neutral + + + Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. + + Event data. + + The event invokes delegates which pass event data via this class. + + + + GLib.SignalArgs + + + + + + + Constructor + + + + Public Constructor. + A new + Create a new instance with this constructor if you need to invoke a delegate. + + + + + Property + + GLib.Object + + + + The object on which the accelerator was activated + a + + + + + + Property + + System.UInt32 + + + + The accelerator keyval + a + + + + + + Property + + Gdk.ModifierType + + + + The modifier combination of the accelerator + a + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/AccelActivateHandler.xml b/doc/en/Gtk/AccelActivateHandler.xml new file mode 100644 index 000000000..e5a7db988 --- /dev/null +++ b/doc/en/Gtk/AccelActivateHandler.xml @@ -0,0 +1,39 @@ + + + + gtk-sharp + [00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4] + 2.0.0.0 + neutral + + + Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. + + Event handler. + + The event utilizes this delegate: + Event data is passed via the parameter. + To attach a to an event, add the AccelActivateHandler instance to the event. The methods referenced by the AccelActivateHandler instance are invoked whenever the event is raised, until the AccelActivateHandler is removed from the event. + + + + System.Delegate + + + + System.ICloneable + + + System.Runtime.Serialization.ISerializable + + + + + + System.Void + + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/AccelGroup.xml b/doc/en/Gtk/AccelGroup.xml index ddf9a5c31..ddf250cf5 100644 --- a/doc/en/Gtk/AccelGroup.xml +++ b/doc/en/Gtk/AccelGroup.xml @@ -103,7 +103,7 @@ Installs an accelerator in this group, using an accelerator path to look up the appropriate key and modifiers - (see ). When the + (see ). When the group is being activated in response to a call to , will be invoked if the accel_key and accel_mods from match the key and modifiers for the path. @@ -327,8 +327,41 @@ a a a + + + + + + + Event + + Gtk.AccelActivateHandler + + + + + + + Method + + System.Boolean + + + + + + + + Default handler for the event. + a + a + a + a + Override this method in a subclass to provide a default handler for the event. + + - + \ No newline at end of file diff --git a/doc/en/Gtk/AccelMap.xml b/doc/en/Gtk/AccelMap.xml index 35468a460..732f0c23c 100644 --- a/doc/en/Gtk/AccelMap.xml +++ b/doc/en/Gtk/AccelMap.xml @@ -36,11 +36,12 @@ - Looks up the accelerator entry for and fills in . + Looks up the accelerator entry for and fills in . a , a valid accelerator path a , the accelerator key to be filled in (optional) - a , if is known, otherwise. - + a , if is known, otherwise. + + @@ -55,30 +56,29 @@ Locks the given accelerator path. If the accelerator map doesn't yet contain - an entry for , a new one is created. + an entry for , a new one is created. a - + Locking an accelerator path prevents its accelerator from being changed during runtime. A locked accelerator path can be unlocked by - . - Refer to + . + Refer to for information about runtime accelerator changes. - - If called more than once, remains locked until - + + If called more than once, remains locked until + has been called an equivalent number of times. - - + Note that locking of individual accelerator paths is independent from - locking the containing them. For runtime accelerator + locking the containing them. For runtime accelerator changes to be possible both the accelerator path and its - have to be unlocked. + have to be unlocked. - + @@ -92,12 +92,12 @@ - Undoes the last call to - on this . + Undoes the last call to + on this . a , a valid accelerator path - Refer to for information + Refer to for information about accelerator path locking. @@ -115,8 +115,8 @@ - Changes the and currently associated with - . + Changes the and currently associated with + . a a @@ -125,9 +125,9 @@ a Due to conflicts with other accelerators, a change may not always be possible. The - parameter indicates whether other accelerators may be deleted to resolve such + parameter indicates whether other accelerators may be deleted to resolve such conflicts. A change will only occur if all conflicts could be resolved (which might not be the case if conflicting accelerators are locked). Successful - changes are indicated by a return value. + changes are indicated by a return value. @@ -142,11 +142,12 @@ - Parses a file previously saved with + Parses a file previously saved with for accelerator specifications, and propagates them accordingly. a - + + @@ -160,10 +161,11 @@ - File descriptor variant of . + File descriptor variant of . a , a valid writeable file descriptor - + + @@ -178,12 +180,13 @@ Saves current accelerator specifications (accelerator path, key - and modifiers) to . + and modifiers) to . The file is written in a format suitable to be read back in by - . + . a , a file to contain accelerator specifications - + + @@ -197,10 +200,11 @@ - File descriptor variant of . + File descriptor variant of . a , a valid readable file descriptor. - + + @@ -222,10 +226,10 @@ a a - This function should only be called once per - with the canonical and for this path. + This function should only be called once per + with the canonical and for this path. To change the accelerator during runtime programatically, use - . + . The accelerator path must consist of "<WINDOWTYPE>/Category1/Category2/.../Action", where <WINDOWTYPE> should be a unique application-specific identifier, that corresponds to the kind of window the accelerator is being used in, e.g. "Gimp-Image", @@ -253,16 +257,16 @@ a - + Accel map entries whose accel path matches one of the filters - are skipped by . + are skipped by . - + This function is intended for Gtk# modules that create their own menus but don't want them to be saved into the applications accelerator map dump. - + @@ -274,13 +278,14 @@ - Gets the singleton global. object. This object + Gets the singleton global. object. This object is useful only for notification of changes to the accelerator map via the internal "changed" signal; it isn't a parameter to the other accelerator map functions. a - + + @@ -297,13 +302,13 @@ Loops over the entries in the accelerator map whose accel path doesn't match any of the filters added with - - and executes on each. + + and executes on each. - a , data to pass to + a , data to pass to a , function to execute on each accel map entrey - See also . + See also . XXX: See http://bugzilla.ximian.com/show_bug.cgi?id=70912. @@ -320,11 +325,11 @@ Loops over all entries in the accelerator map and executes - * on each. + * on each. a a - See also . + See also . @@ -377,7 +382,8 @@ Protected constructor. a - + + @@ -393,5 +399,36 @@ Returns the native value for . + + + Event + + Gtk.MapChangedHandler + + + + Fired when there is a change to the global accelerator map. + + + + + + Method + + System.Void + + + + + + + + Default handler for the event. + a + a + a + Override this method in a subclass to provide a default handler for the event. + + - + \ No newline at end of file diff --git a/doc/en/Gtk/ActionGroup.xml b/doc/en/Gtk/ActionGroup.xml index 5db45480b..9501a3e36 100644 --- a/doc/en/Gtk/ActionGroup.xml +++ b/doc/en/Gtk/ActionGroup.xml @@ -329,5 +329,117 @@ Therefore you must either set the accel path yourself with for more info. + + + Event + + Gtk.PreActivateHandler + + + + The PreActivate signal is emitted just before the action is activated. + This is intended for applications to get notification just before any action is activated. + + + + + Event + + Gtk.ConnectProxyHandler + + + + The ConnectProxy signal is emitted after connecting a proxy to an action in the group. + This is intended for simple customizations for which a custom action class would be too clumsy, e.g. showing tooltips for menuitems in the statusbar. + + + + + Event + + Gtk.DisconnectProxyHandler + + + + The DisconnectProxy signal is emitted after disconnecting a proxy from an action in the group. + + + + + + Event + + Gtk.PostActivateHandler + + + + The PostActivate signal is emitted just after the action is activated. + This is intended for applications to get notification just after any action is activated. + + + + + Method + + System.Void + + + + + + Default handler for the event. + a + Override this method in a subclass to provide a default handler for the event. + + + + + Method + + System.Void + + + + + + + Default handler for the event. + a + a + Override this method in a subclass to provide a default handler for the event. + + + + + Method + + System.Void + + + + + + + Default handler for the event. + a + a + Override this method in a subclass to provide a default handler for the event. + + + + + Method + + System.Void + + + + + + Default handler for the event. + a + Override this method in a subclass to provide a default handler for the event. + + - + \ No newline at end of file diff --git a/doc/en/Gtk/MapChangedArgs.xml b/doc/en/Gtk/MapChangedArgs.xml new file mode 100644 index 000000000..0ccde50b6 --- /dev/null +++ b/doc/en/Gtk/MapChangedArgs.xml @@ -0,0 +1,74 @@ + + + + gtk-sharp + [00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4] + 2.0.0.0 + neutral + + + Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. + + Event data. + + The event invokes delegates which pass event data via this class. + + + + GLib.SignalArgs + + + + + + + Constructor + + + + Public Constructor. + A new . + Create a new instance with this constructor if you need to invoke a delegate. + + + + + Property + + System.String + + + + The path of the accelerator that changed + a + + + + + + Property + + System.UInt32 + + + + The key value for the new accelerator + a + + + + + + Property + + Gdk.ModifierType + + + + The modifier mask for the new accelerator + a + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/MapChangedHandler.xml b/doc/en/Gtk/MapChangedHandler.xml new file mode 100644 index 000000000..b3e3bfce7 --- /dev/null +++ b/doc/en/Gtk/MapChangedHandler.xml @@ -0,0 +1,39 @@ + + + + gtk-sharp + [00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4] + 2.0.0.0 + neutral + + + Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. + + Event handler. + + The event utilizes this delegate: + Event data is passed via the parameter. + To attach a to an event, add the MapChangedHandler instance to the event. The methods referenced by the MapChangedHandler instance are invoked whenever the event is raised, until the MapChangedHandler is removed from the event. + + + + System.Delegate + + + + System.ICloneable + + + System.Runtime.Serialization.ISerializable + + + + + + System.Void + + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Widget.xml b/doc/en/Gtk/Widget.xml index 20a96e5fe..6c498f99c 100644 --- a/doc/en/Gtk/Widget.xml +++ b/doc/en/Gtk/Widget.xml @@ -4182,4 +4182,30 @@ Widgets are required to honor the size allocation they receive; a size request i a + + + Event + + Gtk.WidgetEventAfterHandler + + + + Emits the WidgetEventAfter. + + + + + Method + + System.Void + + + + + + Default handler for the event. + a + a + Override this method in a subclass to provide a default handler for the event. + \ No newline at end of file diff --git a/doc/en/Gtk/WidgetEventAfterArgs.xml b/doc/en/Gtk/WidgetEventAfterArgs.xml new file mode 100644 index 000000000..90b0c882d --- /dev/null +++ b/doc/en/Gtk/WidgetEventAfterArgs.xml @@ -0,0 +1,48 @@ + + + + gtk-sharp + [00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4] + 2.0.0.0 + neutral + + + Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. + + Event data. + + The event invokes delegates which pass event data via this class. + + + + GLib.SignalArgs + + + + + + + Constructor + + + + Public Constructor. + A new . + Create a new instance with this constructor if you need to invoke a delegate. + + + + + Property + + Gdk.Event + + + + The uses this method to access the details of an event. + a + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/WidgetEventAfterHandler.xml b/doc/en/Gtk/WidgetEventAfterHandler.xml new file mode 100644 index 000000000..5b232f869 --- /dev/null +++ b/doc/en/Gtk/WidgetEventAfterHandler.xml @@ -0,0 +1,39 @@ + + + + gtk-sharp + [00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4] + 2.0.0.0 + neutral + + + Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. + + Event handler. + + The event utilizes this delegate: + Event data is passed via the parameter. + To attach a to an event, add the WidgetEventAfterHandler instance to the event. The methods referenced by the WidgetEventAfterHandler instance are invoked whenever the event is raised, until the WidgetEventAfterHandler is removed from the event. + + + + System.Delegate + + + + System.ICloneable + + + System.Runtime.Serialization.ISerializable + + + + + + System.Void + + + + + + \ No newline at end of file diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index fb66add5a..24093a798 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -98,6 +98,15 @@ label Activated 1 + accel_group + acceleratable + keyval + modifier + MapChanged + map + accel_path + accel_key + accel_mods Add 1 1 @@ -108,6 +117,16 @@ 1 1 Remove + action_group + action + proxy + action_group + action + proxy + action_group + action + action_group + action 1 Change ChangeValue @@ -427,6 +446,9 @@ AccelCanActivate ChildNotified WidgetEvent + widget + event + WidgetEventAfter Focused FocusGrabbed Hidden diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw index 565c96b82..8d731ae69 100644 --- a/gtk/gtk-api.raw +++ b/gtk/gtk-api.raw @@ -2077,7 +2077,7 @@ - + @@ -2206,7 +2206,7 @@ - + @@ -2460,7 +2460,7 @@ - + @@ -2468,21 +2468,21 @@ - + - + - + @@ -13243,7 +13243,7 @@ - + diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index a654cb4c2..acc786205 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -877,7 +877,7 @@ sub parseTypeToken } else { $tok =~ s/_TYPE//; $tok =~ s/\|.*STATIC_SCOPE//; - $tok =~ s/\s+//g; + $tok =~ s/\W+//g; return StudlyCaps (lc($tok)); } }