diff --git a/ChangeLog b/ChangeLog index 9e29ffa31..42422da65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2004-11-18 Dan Winship + + Redo child property handling; now we generate classes to hold the + child properties for a given widget in a container, and generate + the child properties as properties on those classes. + + * parser/gapi2xml.pl (addPropElem): don't prepend "child_" to + child prop names any more + + * generator/ClassBase.cs (ClassBase): keep childprops separate + from properties + (GenChildProperties): create a subclass of Gtk.ContainerChild + containing the container type's child properties, and override the + Container indexer to return that type. + + * generator/ObjectGen.cs (Generate): call GenChildProperties + + * generator/Property.cs: + * generator/ChildProperty.cs: Simplify these a bunch, since child + properties are now represented as C# properties as well. Also add + [GLib.Property(cname)] and [Gtk.ChildProperty(cname)] attributes. + + * glib/Makefile.am (sources): add PropertyAttribute.cs + + * glib/PropertyAttribute.cs: attribute used to label + GObject properties + + * gtk/Makefile.am (sources): add ChildPropertyAttribute.cs + + * gtk/gtk-api.raw: regenerate for parser changes (remove + "Child"/"child_" from child property names). + + * gtk/ChildPropertyAttribute.cs: attribute used to label + GtkContainer child properties + + * gtk/Container.custom: define the ContainerChild class, and an + indexer to return instances of it. + 2004-11-17 Jorn Baayen * gtk/FileChooserDialog.custom : set TransientFor, not Parent. diff --git a/doc/ChangeLog b/doc/ChangeLog index 755c8931f..e97bbfdb8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2004-11-18 Dan Winship + + * en/Gtk/: update for container child property change + 2004-11-16 Dan Winship * en/GLib/Value.xml: document new constructors diff --git a/doc/en/GLib/PropertyAttribute.xml b/doc/en/GLib/PropertyAttribute.xml new file mode 100644 index 000000000..fc361540c --- /dev/null +++ b/doc/en/GLib/PropertyAttribute.xml @@ -0,0 +1,49 @@ + + + + glib-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. + + Attribute used to label a property + + + + System.Attribute + + + + + + + Constructor + + + + + + Attribute constructor + the (C/GObject) name of the property + a + + + + + + Property + + System.String + + + + The (C/GObject) name of the property + a + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Box.xml b/doc/en/Gtk/Box.xml index 8d4efe9da..cb5479bfd 100644 --- a/doc/en/Gtk/Box.xml +++ b/doc/en/Gtk/Box.xml @@ -283,174 +283,20 @@ - - - Method + + + Property - System.UInt32 + Gtk.Container+ContainerChild - Get the padding for . + Accessor for child property items a child of this - - 's padding - See for more details about child properties. - - - - - Method - - System.Void - - - - - - - Set the padding for . - a child of this - the new padding value for - See for more details about child properties. - - - - - Method - - System.Boolean - - - - - - Get the "fill" property for . - a child of this - - 's "fill" property - See for more details about child properties. - - - - - Method - - System.Void - - - - - - - Set the "fill" property for . - a child of this - the new "fill" property for . - See for more details about child properties. - - - - - Method - - System.Boolean - - - - - - Get the "expand" property for . - a child of this - - 's "expand" property - See for more details about child properties. - - - - - Method - - System.Void - - - - - - - Set the "expand" property for . - a child of this - the new "expand" property for - See for more details about child properties. - - - - - Method - - Gtk.PackType - - - - - - Get the pack type (start or end) for . - a child of this - - 's - See for more details about child properties. - - - - - Method - - System.Void - - - - - - - Set the pack type (start or end) for . - a child of this - the new for - See for more details about child properties. - - - - - Method - - System.Int32 - - - - - - Get the position of . - a child of this - - 's position - The child's position in the parent reflects the order it was added in. Children with lower position values appear closer to the end they were packed onto. Children with higher position values appear closer to the center, or the opposite end. - - - - - Method - - System.Void - - - - - - - Set the position of . - a child of this - the new position for - The child's position in the parent reflects the order it was added in. Children with lower position values appear closer to the end they were packed onto. Children with higher position values appear closer to the center, or the opposite end. + a + You can cast the returned object to to access its child properties. diff --git a/doc/en/Gtk/BoxChild.xml b/doc/en/Gtk/BoxChild.xml new file mode 100644 index 000000000..a97e1075d --- /dev/null +++ b/doc/en/Gtk/BoxChild.xml @@ -0,0 +1,87 @@ + + + + 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. + + A child of a , used to interact with its container child properties. + + + + Gtk.Container+ContainerChild + + + + + + + Property + + Gtk.PackType + + + + The child's pack type (start or end) + a + See for more details about child properties. + + + + + Property + + System.UInt32 + + + + The child's padding + the padding + See for more details about child properties. + + + + + Property + + System.Boolean + + + + The "fill" property for the child + the child's "fill" property + See for more details about child properties. + + + + + Property + + System.Boolean + + + + The "expand" property for the child + the child's "expand" property + See for more details about child properties. + + + + + Property + + System.Int32 + + + + The child's position in the + the child's position + The child's position in the parent reflects the order it was added in. Children with lower position values appear closer to the end they were packed onto. Children with higher position values appear closer to the center, or the opposite end. + + + + \ No newline at end of file diff --git a/doc/en/Gtk/ButtonBox.xml b/doc/en/Gtk/ButtonBox.xml index e433f5ae0..28862cdd3 100644 --- a/doc/en/Gtk/ButtonBox.xml +++ b/doc/en/Gtk/ButtonBox.xml @@ -198,6 +198,22 @@ To be added + + + Property + + Gtk.Container+ContainerChild + + + + + + Accessor for child property items + a child of this + a + You can cast the returned object to to access its child properties. + + Method @@ -208,30 +224,27 @@ - Gets whether is in the secondary group of children. - a child of this + To be added + a a - See for more details on the "secondary" child property. + To be added - + Method System.Void - + - Sets whether should appear in a secondary group of children. A typical use of a secondary child is the help button in a dialog. - a child of this - - if should be placed in a secondary group, otherwise. - - A secondary group appears after the other children if the style is , or , and before the the other children if the style is . For horizontal button boxes, the definition of before/after depends on direction of the widget (see ). If the style is or , then the secondary children are aligned at the other end of the button box from the main children. For the other styles, they appear immediately next to the main children. - + To be added + a + a + To be added diff --git a/doc/en/Gtk/ButtonBoxChild.xml b/doc/en/Gtk/ButtonBoxChild.xml new file mode 100644 index 000000000..33b4ba6a5 --- /dev/null +++ b/doc/en/Gtk/ButtonBoxChild.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. + + A child of a , used to interact with its container child properties. + + + + Gtk.Container+ContainerChild + + + + + + + Property + + System.Boolean + + + + Whether or not the child should appear in a secondary group of children + + or + + + A secondary group appears after the other children if the style is , or , and before the the other children if the style is . For horizontal button boxes, the definition of before/after depends on direction of the widget (see ). If the style is or , then the secondary children are aligned at the other end of the button box from the main children. For the other styles, they appear immediately next to the main children. + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/ChildPropertyAttribute.xml b/doc/en/Gtk/ChildPropertyAttribute.xml new file mode 100644 index 000000000..025389fa0 --- /dev/null +++ b/doc/en/Gtk/ChildPropertyAttribute.xml @@ -0,0 +1,49 @@ + + + + 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. + + Attribute used to label a child property + + + + System.Attribute + + + + + + + Constructor + + + + + + Attribute constructor + the (C/GObject) name of the child property + a + + + + + + Property + + System.String + + + + The (C/GObject) name of the child property + a + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Container.xml b/doc/en/Gtk/Container.xml index b3a732f8a..3f47dc175 100644 --- a/doc/en/Gtk/Container.xml +++ b/doc/en/Gtk/Container.xml @@ -365,8 +365,8 @@ - Fired when a child widget is added to the container via . - Note that this event is fired only when (or its C equivalent) is called. It is not a generic widget-added notification. For example, calling will not result in this event firing. + Fired when a child widget is added to the container via . + Note that this event is fired only when (or its C equivalent) is called. It is not a generic widget-added notification. For example, calling will not result in this event firing. @@ -390,7 +390,7 @@ Fired when a child widget is removed from this container - Note that this event is fired only when (or its C equivalent) is called. If a subclass defines additional methods for removing widgets, then calling those methods will not result in this event being fired. + Note that this event is fired only when (or its C equivalent) is called. If a subclass defines additional methods for removing widgets, then calling those methods will not result in this event being fired. @@ -624,5 +624,21 @@ To be added + + + Property + + Gtk.Container+ContainerChild + + + + + + Access for child properties + a child of this container + a + The base type is not very useful; you will normally need to cast it to a subclass of the appropriate type. + + \ No newline at end of file diff --git a/doc/en/Gtk/ContainerChild.xml b/doc/en/Gtk/ContainerChild.xml new file mode 100644 index 000000000..b7d6b0f7f --- /dev/null +++ b/doc/en/Gtk/ContainerChild.xml @@ -0,0 +1,90 @@ + + + + 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. + + To be added + To be added + + + System.Object + + + + + + + Field + + Gtk.Container + + + + + To be added + To be added + + + + + Field + + Gtk.Widget + + + + + To be added + To be added + + + + + Constructor + + + + + + + To be added + a + a + a + To be added + + + + + Property + + Gtk.Container + + + + To be added + a + To be added + + + + + Property + + Gtk.Widget + + + + To be added + a + To be added + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Fixed.xml b/doc/en/Gtk/Fixed.xml index 5b6123944..18171056b 100644 --- a/doc/en/Gtk/Fixed.xml +++ b/doc/en/Gtk/Fixed.xml @@ -171,70 +171,20 @@ Chain to this constructor if you have manually registered a native value for your subclass. - - - Method + + + Property - System.Int32 + Gtk.Container+ContainerChild - Get the X coordinate of a child . + Accessor for child property items a child of this - 's X coordinate - - - - - - Method - - System.Void - - - - - - - Set the X coordinate of a child . - a child of this - 's new X coordinate - - - - - - Method - - System.Int32 - - - - - - Get the Y coordinate of a child . - a child of this - 's Y coordinate - - - - - - Method - - System.Void - - - - - - - Set the Y coordinate of a child . - a child of this - 's new Y coordinate - + a + You can cast the returned object to to access its child properties. diff --git a/doc/en/Gtk/FixedChild.xml b/doc/en/Gtk/FixedChild.xml new file mode 100644 index 000000000..69c80e237 --- /dev/null +++ b/doc/en/Gtk/FixedChild.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. + + A child of a , used to interact with its container child properties. + + + + Gtk.Container+ContainerChild + + + + + + + Property + + System.Int32 + + + + The child's X coordinate + The child's X coordinate + + + + + + Property + + System.Int32 + + + + The child's Y coordinate + The child's Y coordinate + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Layout.xml b/doc/en/Gtk/Layout.xml index 5e804d290..c872727d2 100644 --- a/doc/en/Gtk/Layout.xml +++ b/doc/en/Gtk/Layout.xml @@ -311,70 +311,20 @@ To be added - - - Method + + + Property - System.Int32 + Gtk.Container+ContainerChild - Get the X coordinate of a child . - a child of this - 's X coordinate - - - - - - Method - - System.Void - - - - - - - Set the X coordinate of a child . - a child of this - 's new X coordinate - - - - - - Method - - System.Int32 - - - - - - Get the Y coordinate of a child . - a child of this - 's Y coordinate - - - - - - Method - - System.Void - - - - - - - Set the Y coordinate of a child . - a child of this - 's new Y coordinate - + Accessor for child property items + a child of this layout + a + You can cast the returned object to to access its child properties. diff --git a/doc/en/Gtk/LayoutChild.xml b/doc/en/Gtk/LayoutChild.xml new file mode 100644 index 000000000..472d96aef --- /dev/null +++ b/doc/en/Gtk/LayoutChild.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. + + A child of a , used to interact with its container child properties. + + + + Gtk.Container+ContainerChild + + + + + + + Property + + System.Int32 + + + + X coordinate of the child + the child's X coordinate + + + + + + Property + + System.Int32 + + + + Y coordinate of the child + the child's Y coordinate + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Menu.xml b/doc/en/Gtk/Menu.xml index 7fe156d51..249d55b97 100644 --- a/doc/en/Gtk/Menu.xml +++ b/doc/en/Gtk/Menu.xml @@ -524,136 +524,20 @@ class PopupSample To be added - - - Method + + + Property - System.Int32 + Gtk.Container+ContainerChild - Get the row that the top of a menu item is attached to. + Accessor for child property items a child of this - the row - See . - - - - - Method - - System.Void - - - - - - - Set the row that the top of a menu item is attached to. - a child of this - the row - See . - - - - - Method - - System.Int32 - - - - - - Get the row that the bottom of a menu item is attached to. - a child of this - the row - See . - - - - - Method - - System.Void - - - - - - - Set the row that the bottom of a menu item is attached to. - a child of this - the row - See . - - - - - Method - - System.Int32 - - - - - - Get the column that the right of a menu item is attached to. - a child of this - the column - See . - - - - - Method - - System.Void - - - - - - - Set the column that the right of a menu item is attached to. - a child of this - the column - See . - - - - - Method - - System.Int32 - - - - - - Get the column that the left of a menu item is attached to. - a child of this - the column - See . - - - - - Method - - System.Void - - - - - - - Set the column that the left of a menu item is attached to. - a child of this - the column - See . + a + You can cast the returned object to to access its child properties. diff --git a/doc/en/Gtk/MenuChild.xml b/doc/en/Gtk/MenuChild.xml new file mode 100644 index 000000000..ffc0173f0 --- /dev/null +++ b/doc/en/Gtk/MenuChild.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. + + A child of a , used to interact with its container child properties. + + + + Gtk.Container+ContainerChild + + + + + + + Property + + System.Int32 + + + + The row that the bottom of the menu item is attached to. + the row + See for more details + + + + + Property + + System.Int32 + + + + The row that the top of the menu item is attached to. + the row + See for more details + + + + + Property + + System.Int32 + + + + The column that the left side of the menu item is attached to. + the column + See for more details + + + + + Property + + System.Int32 + + + + The column that the right side of the menu item is attached to. + the column + See for more details + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Notebook.xml b/doc/en/Gtk/Notebook.xml index ccebf571a..2f87612e2 100644 --- a/doc/en/Gtk/Notebook.xml +++ b/doc/en/Gtk/Notebook.xml @@ -1031,202 +1031,20 @@ Don't forget to call the Show method on the widget or else the new page will not - - - Method + + + Property - System.String + Gtk.Container+ContainerChild - Get a page's tab label. + Accessor for child property items a child of this - the page's tab label - - - - - - Method - - System.Void - - - - - - - Set a page's tab label. - a child of this - the page's new tab label - - - - - - Method - - System.Boolean - - - - - - Get the "fill" value of a page's tab label. - a child of this - if the page's label is set to "fill" - See for more details. - - - - - Method - - System.Void - - - - - - - Set the "fill" value of a page's tab label. - a child of this - whether or not the page's label should "fill" - See for more details. - - - - - Method - - System.Boolean - - - - - - Get the "expand" value of a page's tab label. - a child of this - if the page's label is set to "expand" - See for more details. - - - - - Method - - System.Void - - - - - - - Set the "expand" value of a a page's tab label. - a child of this - whether or not the page's label should "expand" - See for more details. - - - - - Method - - Gtk.PackType - - - - - - Get the pack type of a page's tab label. - a child of this - 's label's pack type - See for more details. - - - - - Method - - System.Void - - - - - - - Set the pack type of a page's tab label. - a child of this - 's label's new pack type - See for more details. - - - - - Method - - System.Int32 - - - - - - Get the position within the notebook of a page. - a child of this - the position of in the notebook - - - - - - Method - - System.Void - - - - - - - Set the position within the notebook of a page. - a child of this - the new position of in the notebook - - - - - - Method - - System.String - - - - - - Get a page's menu label. - a child of this - the label of that page in the notebook's pop-up menu - - - - - - Method - - System.Void - - - - - - - Set a page's menu label. - a child of this - the new label of that page in the notebook's pop-up menu - + a + You can cast the returned object to to access its child properties. diff --git a/doc/en/Gtk/NotebookChild.xml b/doc/en/Gtk/NotebookChild.xml new file mode 100644 index 000000000..04ce826de --- /dev/null +++ b/doc/en/Gtk/NotebookChild.xml @@ -0,0 +1,104 @@ + + + + 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. + + A child of a , used to interact with its container child properties. + + + + Gtk.Container+ContainerChild + + + + + + + Property + + System.Boolean + + + + The "expand" property of a tab's label + + if the page's label is set to "expand" + + See for more details. + + + + + Property + + System.Int32 + + + + The page's position within the notebook. + the position + + + + + + Property + + System.String + + + + The page's menu label + the label of the page in the notebook's pop-up menu + + + + + + Property + + System.Boolean + + + + The "fill" property of a tab's label + + if the page's label is set to "fill" + + See for more details. + + + + + Property + + Gtk.PackType + + + + The pack type of a page's tab label + the label's + See for more details. + + + + + Property + + System.String + + + + The page's tab label + the label + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Paned.xml b/doc/en/Gtk/Paned.xml index ca24e04d2..d3294b9ab 100644 --- a/doc/en/Gtk/Paned.xml +++ b/doc/en/Gtk/Paned.xml @@ -470,70 +470,20 @@ public Widget GetExampleFrame() To be added - - - Method + + + Property - System.Boolean + Gtk.Container+ContainerChild - Test whether or not the child resizes with the parent + Accessor for child property items a child of this - if should be resized as the parent is resized - - - - - - Method - - System.Void - - - - - - - Set whether or not the child resizes with the parent - a child of this - if should be resized as the parent is resized - - - - - - Method - - System.Boolean - - - - - - Test whether or not the child can be shrunk to less than its - a child of this - if the pane can be adjusted to make smaller than its - - - - - - Method - - System.Void - - - - - - - Set whether or not the child can be shrunk to less than its - a child of this - if the pane can be adjusted to make smaller than its - + a + You can cast the returned object to to access its child properties. diff --git a/doc/en/Gtk/PanedChild.xml b/doc/en/Gtk/PanedChild.xml new file mode 100644 index 000000000..af7e4bca7 --- /dev/null +++ b/doc/en/Gtk/PanedChild.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. + + A child of a , used to interact with its container child properties. + + + + Gtk.Container+ContainerChild + + + + + + + Property + + System.Boolean + + + + Whether or not the child can be shrunk to less than its + if the pane can be adjusted to make the child smaller than its + + + + + + Property + + System.Boolean + + + + Whether or not the child resizes with the parent + if the child should be resized as the parent is resized + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Table.xml b/doc/en/Gtk/Table.xml index 538eb70dc..b06e99e8f 100644 --- a/doc/en/Gtk/Table.xml +++ b/doc/en/Gtk/Table.xml @@ -345,268 +345,20 @@ public Widget MakeTableTester() Chain to this constructor if you have manually registered a native value for your subclass. - - - Method + + + Property - Gtk.AttachOptions + Gtk.Container+ContainerChild - Get a child's horizontal attachment options - a child of this - the - - - - - - Method - - System.Void - - - - - - - Set a child's horizontal attachment options - a child of this - the - - - - - - Method - - Gtk.AttachOptions - - - - - - Get a child's vertical attachment options - a child of this - the - - - - - - Method - - System.Void - - - - - - - Set a child's vertical attachment options - a child of this - the - - - - - - Method - - System.UInt32 - - - - - - Get the row that the bottom of this child is attached to. - a child of this - the row - - - - - - Method - - System.Void - - - - - - - Set the row that the bottom of this child is attached to. - a child of this - the row - - - - - - Method - - System.UInt32 - - - - - - Get the row that the top of this child is attached to. - a child of this - the row - - - - - - Method - - System.Void - - - - - - - Set the row that the top of this child is attached to. - a child of this - the row - - - - - - Method - - System.UInt32 - - - - - - Get the column that the left of this child is attached to. - a child of this - the column - - - - - - Method - - System.Void - - - - - - - Set the column that the left of this child is attached to. - a child of this - the column - - - - - - Method - - System.UInt32 - - - - - - Get the column that the right of this child is attached to. - a child of this - the column - - - - - - Method - - System.Void - - - - - - - Set the column that the right of this child is attached to. - a child of this - the column - - - - - - Method - - System.UInt32 - - - - - - Get the horizontal padding for this child - a child of this - the padding - - - - - - Method - - System.Void - - - - - - - Set the horizontal padding for this child - a child of this - the padding - - - - - - Method - - System.UInt32 - - - - - - Get the vertical padding for this child - a child of this - the padding - - - - - - Method - - System.Void - - - - - - - Set the vertical padding for this child - a child of this - the padding - + Accessor for child property items + a child of this table + a + You can cast the returned object to to access its child properties. diff --git a/doc/en/Gtk/TableChild.xml b/doc/en/Gtk/TableChild.xml new file mode 100644 index 000000000..6950b03f7 --- /dev/null +++ b/doc/en/Gtk/TableChild.xml @@ -0,0 +1,126 @@ + + + + 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. + + A child of a , used to interact with its container child properties. + + + + Gtk.Container+ContainerChild + + + + + + + Property + + System.UInt32 + + + + The table row that the bottom of this child is attached to + the row + + + + + + Property + + System.UInt32 + + + + The table row that the top of this child is attached to + the row + + + + + + Property + + System.UInt32 + + + + The table column that the left side of this child is attached to + the column + + + + + + Property + + System.UInt32 + + + + The table column that the right side of this child is attached to + the column + + + + + + Property + + System.UInt32 + + + + The vertical padding for this child + the padding + + + + + + Property + + Gtk.AttachOptions + + + + The child's vertical attachment options + the + + + + + + Property + + System.UInt32 + + + + The horizontal padding for this child + the padding + + + + + + Property + + Gtk.AttachOptions + + + + The child's vertical attachment options + the + + + + + \ No newline at end of file diff --git a/doc/en/Gtk/Toolbar.xml b/doc/en/Gtk/Toolbar.xml index 1e6fe6bdf..2b30c310d 100644 --- a/doc/en/Gtk/Toolbar.xml +++ b/doc/en/Gtk/Toolbar.xml @@ -730,70 +730,20 @@ If type == , widget is used as the n To be added - - - Method + + + Property - System.Boolean + Gtk.Container+ContainerChild - Test whether or not the child should be the same size as other (homogeneous) items - a child of this - if is the same size as other (homogeneous) items in this toolbar - - - - - - Method - - System.Void - - - - - - - Set whether or not the child should be the same size as other (homogeneous) items - a child of this - if should be the same size as other (homogeneous) items in this toolbar - - - - - - Method - - System.Boolean - - - - - - Test whether or not the child should receive extra space as the toolbar grows. - a child of this - if receives extra space as the toolbar grows - - - - - - Method - - System.Void - - - - - - - Set whether or not the child should receive extra space as the toolbar grows. - a child of this - if should receive extra space as the toolbar grows - + Accessor for child property items + a child of this toolbar + a + You can cast the returned object to to access its child properties. diff --git a/doc/en/Gtk/ToolbarChild.xml b/doc/en/Gtk/ToolbarChild.xml new file mode 100644 index 000000000..e9abc36f6 --- /dev/null +++ b/doc/en/Gtk/ToolbarChild.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. + + A child of a , used to interact with its container child properties. + + + + Gtk.Container+ContainerChild + + + + + + + Property + + System.Boolean + + + + Whether or not the child should be the same size as other (homogeneous) items + a + + + + + + Property + + System.Boolean + + + + Whether or not the child should receive extra space as the toolbar grows. + a + + + + + \ No newline at end of file diff --git a/generator/ChildProperty.cs b/generator/ChildProperty.cs index 35a95181c..fe361edf1 100644 --- a/generator/ChildProperty.cs +++ b/generator/ChildProperty.cs @@ -28,35 +28,16 @@ namespace GtkSharp.Generation { public ChildProperty (XmlElement elem, ClassBase container_type) : base (elem, container_type) {} - protected override string QuotedPropertyName (string cname) { - if (cname.StartsWith ("child_")) - return "\"" + cname.Substring (6) + "\""; - else - return "\"" + cname + "\""; - } - - protected override string PropertyHeader (ref string indent, string modifiers, string cs_type, string name) { - return ""; - } - - protected override string GetterHeader (string modifiers, string cs_type, string name) { - return "public " + modifiers + cs_type + " Get" + name + " (Widget child)"; + protected override string PropertyAttribute (string qpname) { + return "[Gtk.ChildProperty (" + qpname + ")]"; } protected override string RawGetter (string qpname) { - return "ChildGetProperty (child, " + qpname + ")"; - } - - protected override string SetterHeader (string modifiers, string cs_type, string name) { - return "public " + modifiers + "void Set" + name + " (Widget child, " + cs_type + " value)"; + return "parent.ChildGetProperty (child, " + qpname + ")"; } protected override string RawSetter (string qpname) { - return "ChildSetProperty(child, " + qpname + ", val)"; - } - - protected override string PropertyFooter (string indent) { - return ""; + return "parent.ChildSetProperty(child, " + qpname + ", val)"; } } diff --git a/generator/ClassBase.cs b/generator/ClassBase.cs index fa7f8be64..19432789a 100644 --- a/generator/ClassBase.cs +++ b/generator/ClassBase.cs @@ -31,6 +31,7 @@ namespace GtkSharp.Generation { public class ClassBase : GenBase { protected Hashtable props = new Hashtable(); + protected Hashtable childprops = new Hashtable(); protected Hashtable sigs = new Hashtable(); protected Hashtable methods = new Hashtable(); protected ArrayList interfaces = null; @@ -97,7 +98,7 @@ namespace GtkSharp.Generation { name = member.GetAttribute("name"); while (props.ContainsKey(name)) name += "mangled"; - props.Add (name, new ChildProperty (member, this)); + childprops.Add (name, new ChildProperty (member, this)); break; case "signal": @@ -195,17 +196,47 @@ namespace GtkSharp.Generation { protected void GenProperties (GenerationInfo gen_info) { - if (props == null) + if (props.Count == 0) return; foreach (Property prop in props.Values) { if (prop.Validate ()) - prop.Generate (gen_info); + prop.Generate (gen_info, "\t\t"); else Console.WriteLine("in Object " + QualifiedName); } } + protected void GenChildProperties (GenerationInfo gen_info) + { + if (childprops.Count == 0) + return; + + StreamWriter sw = gen_info.Writer; + + sw.WriteLine ("\t\tpublic new class " + Name + "Child : Gtk.Container.ContainerChild {"); + sw.WriteLine ("\t\t\tinternal " + Name + "Child (Gtk.Container parent, Gtk.Widget child) : base (parent, child) {}"); + sw.WriteLine (""); + + foreach (ChildProperty prop in childprops.Values) { + if (prop.Validate ()) + prop.Generate (gen_info, "\t\t\t"); + else + Console.WriteLine("in Object " + QualifiedName); + } + + sw.WriteLine ("\t\t}"); + sw.WriteLine (""); + + sw.WriteLine ("\t\tpublic override Gtk.Container.ContainerChild this [Gtk.Widget child] {"); + sw.WriteLine ("\t\t\tget {"); + sw.WriteLine ("\t\t\t\treturn new " + Name + "Child (this, child);"); + sw.WriteLine ("\t\t\t}"); + sw.WriteLine ("\t\t}"); + sw.WriteLine (""); + + } + public void GenSignals (GenerationInfo gen_info, ClassBase implementor) { if (sigs == null) diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs index 556b0fa06..22b5ab772 100644 --- a/generator/ObjectGen.cs +++ b/generator/ObjectGen.cs @@ -146,6 +146,7 @@ namespace GtkSharp.Generation { GenCtors (gen_info); GenProperties (gen_info); + GenChildProperties (gen_info); bool has_sigs = (sigs != null && sigs.Count > 0); if (!has_sigs && interfaces != null) { diff --git a/generator/Property.cs b/generator/Property.cs index 90f4e57be..f8a6e4086 100644 --- a/generator/Property.cs +++ b/generator/Property.cs @@ -66,39 +66,19 @@ namespace GtkSharp.Generation { return true; } - protected virtual string QuotedPropertyName (string cname) { - return "\"" + cname + "\""; - } - - protected virtual string PropertyHeader (ref string indent, string modifiers, string cs_type, string name) { - string header; - - header = indent + "public " + modifiers + cs_type + " " + name + " {\n"; - indent += "\t"; - return header; - } - - protected virtual string GetterHeader (string modifiers, string cs_type, string name) { - return "get"; + protected virtual string PropertyAttribute (string qpname) { + return "[GLib.Property (" + qpname + ")]"; } protected virtual string RawGetter (string qpname) { return "GetProperty (" + qpname + ")"; } - protected virtual string SetterHeader (string modifiers, string cs_type, string name) { - return "set"; - } - protected virtual string RawSetter (string qpname) { return "SetProperty(" + qpname + ", val)"; } - protected virtual string PropertyFooter (string indent) { - return indent.Substring (1) + "}\n"; - } - - public void Generate (GenerationInfo gen_info) + public void Generate (GenerationInfo gen_info, string indent) { SymbolTable table = SymbolTable.Table; StreamWriter sw = gen_info.Writer; @@ -115,7 +95,7 @@ namespace GtkSharp.Generation { if (name == container_type.Name) { name += "Prop"; } - string qpname = QuotedPropertyName (elem.GetAttribute("cname")); + string qpname = "\"" + elem.GetAttribute("cname") + "\""; string v_type = ""; if (table.IsEnum(c_type)) { @@ -173,14 +153,16 @@ namespace GtkSharp.Generation { sw.WriteLine(); - string indent = "\t\t"; - sw.Write(PropertyHeader (ref indent, modifiers, cs_type, name)); + sw.WriteLine (indent + PropertyAttribute (qpname)); + sw.WriteLine (indent + "public " + modifiers + cs_type + " " + name + " {"); + indent += "\t"; + if (has_getter) { - sw.Write(indent + GetterHeader (modifiers, cs_type, name)); + sw.Write(indent + "get "); getter.GenerateBody(gen_info, "\t"); sw.WriteLine(); } else if (elem.HasAttribute("readable")) { - sw.WriteLine(indent + GetterHeader (modifiers, cs_type, name) + " {"); + sw.WriteLine(indent + "get {"); sw.WriteLine(indent + "\tGLib.Value val = " + RawGetter (qpname) + ";"); if (table.IsObject (c_type)) { sw.WriteLine(indent + "\tSystem.IntPtr raw_ret = (System.IntPtr) {0} val;", v_type); @@ -204,11 +186,11 @@ namespace GtkSharp.Generation { } if (has_setter) { - sw.Write(indent + SetterHeader (modifiers, cs_type, name)); + sw.Write(indent + "set "); setter.GenerateBody(gen_info, "\t"); sw.WriteLine(); } else if (elem.HasAttribute("writeable") && !elem.HasAttribute("construct-only")) { - sw.WriteLine(indent + SetterHeader (modifiers, cs_type, name) + " {"); + sw.WriteLine(indent + "set {"); sw.Write(indent + "\tGLib.Value val = "); if (table.IsEnum(c_type)) { sw.WriteLine("new GLib.Value(new GLib.EnumWrapper ((int) value, {0}), \"{1}\");", table.IsEnumFlags (c_type) ? "true" : "false", c_type); @@ -228,7 +210,7 @@ namespace GtkSharp.Generation { sw.WriteLine(indent + "}"); } - sw.Write(PropertyFooter (indent)); + sw.WriteLine(indent.Substring (1) + "}"); sw.WriteLine(); Statistics.PropCount++; diff --git a/glib/Makefile.am b/glib/Makefile.am index 0a54df854..45c04f9a3 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -32,6 +32,7 @@ sources = \ Object.cs \ ObjectManager.cs \ Opaque.cs \ + PropertyAttribute.cs \ SignalArgs.cs \ SignalAttribute.cs \ SignalCallback.cs \ diff --git a/glib/PropertyAttribute.cs b/glib/PropertyAttribute.cs new file mode 100644 index 000000000..b3dbab073 --- /dev/null +++ b/glib/PropertyAttribute.cs @@ -0,0 +1,41 @@ +// PropertyAttribute.cs +// +// Copyright (c) 2004 Novell, Inc. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + +namespace GLib { + + using System; + + public sealed class PropertyAttribute : Attribute { + string name; + + public PropertyAttribute (string name) + { + this.name = name; + } + + public string Name { + get { + return name; + } + set { + name = value; + } + } + } +} diff --git a/gtk/ChildPropertyAttribute.cs b/gtk/ChildPropertyAttribute.cs new file mode 100644 index 000000000..504bc6258 --- /dev/null +++ b/gtk/ChildPropertyAttribute.cs @@ -0,0 +1,40 @@ +// ChildPropertyAttribute.cs +// +// Copyright (c) 2004 Novell, Inc. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + +namespace Gtk { + using System; + + public sealed class ChildPropertyAttribute : Attribute { + string name; + + public ChildPropertyAttribute (string name) + { + this.name = name; + } + + public string Name { + get { + return name; + } + set { + name = value; + } + } + } +} diff --git a/gtk/Container.custom b/gtk/Container.custom index bf1853920..bd3e6c6c0 100644 --- a/gtk/Container.custom +++ b/gtk/Container.custom @@ -186,3 +186,32 @@ public virtual GLib.GType ChildType() { GLib.GType ret = new GLib.GType(raw_ret); return ret; } + +public class ContainerChild { + protected Container parent; + protected Widget child; + + public ContainerChild (Container parent, Widget child) + { + this.parent = parent; + this.child = child; + } + + public Container Parent { + get { + return parent; + } + } + + public Widget Child { + get { + return child; + } + } +} + +public virtual ContainerChild this [Widget w] { + get { + return new ContainerChild (this, w); + } +} diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 34e11dc13..10bf92463 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -18,6 +18,7 @@ DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs sources = \ Application.cs \ + ChildPropertyAttribute.cs \ ITreeNode.cs \ NodeStore.cs \ ThreadNotify.cs \ diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw index 825fe7664..d37de9a46 100644 --- a/gtk/gtk-api.raw +++ b/gtk/gtk-api.raw @@ -3003,11 +3003,11 @@ - - - - - + + + + + @@ -3247,7 +3247,7 @@ - + @@ -5446,8 +5446,8 @@ - - + + @@ -6914,8 +6914,8 @@ - - + + @@ -7162,10 +7162,10 @@ - - - - + + + + @@ -7601,12 +7601,12 @@ - - - - - - + + + + + + @@ -8087,8 +8087,8 @@ - - + + @@ -9648,14 +9648,14 @@ - - - - - - - - + + + + + + + + @@ -11074,8 +11074,8 @@ - - + + diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index 0221f5619..89c4f4057 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -789,9 +789,6 @@ sub addPropElem } else { $name =~ s/\s*\"//g; } - if ($is_child) { - $name = "child_$name"; - } $mode = $params[$#params];