Add Buildable interface

Gir.toml

@@ -480,6 +480,13 @@ status = "generate"
     name = "baseline-position"
     version = "3.10"
 
+[[object]]
+name = "Gtk.Buildable"
+status = "generate"
+    [[object.function]]
+    pattern = "[gs]et_name"
+    ignore = true
+
 [[object]]
 name = "Gtk.CellArea"
 status = "generate"

src/auto/about_dialog.rs

@@ -1,7 +1,8 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use Bin;
+use Buildable;
 use Container;
 use Dialog;
 use License;
@@ -25,7 +26,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct AboutDialog(Object<ffi::GtkAboutDialog, ffi::GtkAboutDialogClass>): Dialog, Window, Bin, Container, Widget;
+    pub struct AboutDialog(Object<ffi::GtkAboutDialog, ffi::GtkAboutDialogClass>): Dialog, Window, Bin, Container, Widget, Buildable;
 
     match fn {
         get_type => || ffi::gtk_about_dialog_get_type(),

src/auto/accel_group.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use ffi;

src/auto/action_bar.rs

@@ -1,7 +1,8 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use Bin;
+use Buildable;
 use Container;
 use PackType;
 use Widget;
@@ -17,7 +18,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct ActionBar(Object<ffi::GtkActionBar, ffi::GtkActionBarClass>): Bin, Container, Widget;
+    pub struct ActionBar(Object<ffi::GtkActionBar, ffi::GtkActionBarClass>): Bin, Container, Widget, Buildable;
 
     match fn {
         get_type => || ffi::gtk_action_bar_get_type(),

src/auto/actionable.rs

@@ -1,6 +1,7 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
+use Buildable;
 use Widget;
 use ffi;
 use glib;
@@ -17,7 +18,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct Actionable(Object<ffi::GtkActionable, ffi::GtkActionableInterface>): Widget;
+    pub struct Actionable(Object<ffi::GtkActionable, ffi::GtkActionableInterface>): Widget, Buildable;
 
     match fn {
         get_type => || ffi::gtk_actionable_get_type(),

src/auto/adjustment.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use ffi;

src/auto/alignment.rs

@@ -1,7 +1,8 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use Bin;
+use Buildable;
 use Container;
 use Widget;
 use ffi;
@@ -20,7 +21,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct Alignment(Object<ffi::GtkAlignment, ffi::GtkAlignmentClass>): Bin, Container, Widget;
+    pub struct Alignment(Object<ffi::GtkAlignment, ffi::GtkAlignmentClass>): Bin, Container, Widget, Buildable;
 
     match fn {
         get_type => || ffi::gtk_alignment_get_type(),

src/auto/app_chooser_dialog.rs

@@ -1,8 +1,9 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use AppChooser;
 use Bin;
+use Buildable;
 use Container;
 use Dialog;
 use DialogFlags;
@@ -23,7 +24,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct AppChooserDialog(Object<ffi::GtkAppChooserDialog, ffi::GtkAppChooserDialogClass>): Dialog, Window, Bin, Container, Widget, AppChooser;
+    pub struct AppChooserDialog(Object<ffi::GtkAppChooserDialog, ffi::GtkAppChooserDialogClass>): Dialog, Window, Bin, Container, Widget, Buildable, AppChooser;
 
     match fn {
         get_type => || ffi::gtk_app_chooser_dialog_get_type(),

src/auto/app_chooser_widget.rs

@@ -1,8 +1,9 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use AppChooser;
 use Box;
+use Buildable;
 use Container;
 use Menu;
 use Orientable;
@@ -24,7 +25,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct AppChooserWidget(Object<ffi::GtkAppChooserWidget, ffi::GtkAppChooserWidgetClass>): Box, Container, Widget, Orientable, AppChooser;
+    pub struct AppChooserWidget(Object<ffi::GtkAppChooserWidget, ffi::GtkAppChooserWidgetClass>): Box, Container, Widget, Buildable, Orientable, AppChooser;
 
     match fn {
         get_type => || ffi::gtk_app_chooser_widget_get_type(),

src/auto/application.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use ApplicationInhibitFlags;

src/auto/application_window.rs

@@ -1,8 +1,9 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use Application;
 use Bin;
+use Buildable;
 use Container;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 use ShortcutsWindow;
@@ -30,6 +31,7 @@ glib_wrapper! {
         Bin,
         Container,
         Widget,
+        Buildable,
         gio::ActionGroup => gio_ffi::GActionGroup,
         gio::ActionMap => gio_ffi::GActionMap,
     ];

src/auto/arrow.rs

@@ -1,7 +1,8 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use ArrowType;
+use Buildable;
 use Misc;
 use ShadowType;
 use Widget;
@@ -21,7 +22,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct Arrow(Object<ffi::GtkArrow, ffi::GtkArrowClass>): Misc, Widget;
+    pub struct Arrow(Object<ffi::GtkArrow, ffi::GtkArrowClass>): Misc, Widget, Buildable;
 
     match fn {
         get_type => || ffi::gtk_arrow_get_type(),

src/auto/aspect_frame.rs

@@ -1,7 +1,8 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use Bin;
+use Buildable;
 use Container;
 use Frame;
 use Widget;
@@ -21,7 +22,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct AspectFrame(Object<ffi::GtkAspectFrame, ffi::GtkAspectFrameClass>): Frame, Bin, Container, Widget;
+    pub struct AspectFrame(Object<ffi::GtkAspectFrame, ffi::GtkAspectFrameClass>): Frame, Bin, Container, Widget, Buildable;
 
     match fn {
         get_type => || ffi::gtk_aspect_frame_get_type(),

src/auto/assistant.rs

@@ -1,8 +1,9 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use AssistantPageType;
 use Bin;
+use Buildable;
 use Container;
 use Widget;
 use Window;
@@ -22,7 +23,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct Assistant(Object<ffi::GtkAssistant, ffi::GtkAssistantClass>): Window, Bin, Container, Widget;
+    pub struct Assistant(Object<ffi::GtkAssistant, ffi::GtkAssistantClass>): Window, Bin, Container, Widget, Buildable;
 
     match fn {
         get_type => || ffi::gtk_assistant_get_type(),

src/auto/bin.rs

@@ -1,6 +1,7 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
+use Buildable;
 use Container;
 use Widget;
 use ffi;
@@ -12,7 +13,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct Bin(Object<ffi::GtkBin, ffi::GtkBinClass>): Container, Widget;
+    pub struct Bin(Object<ffi::GtkBin, ffi::GtkBinClass>): Container, Widget, Buildable;
 
     match fn {
         get_type => || ffi::gtk_bin_get_type(),

src/auto/box_.rs

@@ -1,8 +1,9 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 use BaselinePosition;
+use Buildable;
 use Container;
 use Orientable;
 use Orientation;
@@ -24,7 +25,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct Box(Object<ffi::GtkBox, ffi::GtkBoxClass>): Container, Widget, Orientable;
+    pub struct Box(Object<ffi::GtkBox, ffi::GtkBoxClass>): Container, Widget, Buildable, Orientable;
 
     match fn {
         get_type => || ffi::gtk_box_get_type(),

src/auto/buildable.rs

@@ -0,0 +1,84 @@
+// This file was generated by gir (e912ccf) from gir-files (469db10)
+// DO NOT EDIT
+
+use Builder;
+use ffi;
+use glib;
+use glib::object::IsA;
+use glib::translate::*;
+use glib_ffi;
+use gobject_ffi;
+use std::mem;
+use std::ptr;
+
+glib_wrapper! {
+    pub struct Buildable(Object<ffi::GtkBuildable, ffi::GtkBuildableIface>);
+
+    match fn {
+        get_type => || ffi::gtk_buildable_get_type(),
+    }
+}
+
+pub trait BuildableExt {
+    fn add_child<'a, P: IsA<glib::Object>, Q: Into<Option<&'a str>>>(&self, builder: &Builder, child: &P, type_: Q);
+
+    fn construct_child(&self, builder: &Builder, name: &str) -> Option<glib::Object>;
+
+    //fn custom_finished<'a, P: IsA<glib::Object> + 'a, Q: Into<Option<&'a P>>, R: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, builder: &Builder, child: Q, tagname: &str, data: R);
+
+    //fn custom_tag_end<'a, P: IsA<glib::Object> + 'a, Q: Into<Option<&'a P>>, R: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, builder: &Builder, child: Q, tagname: &str, data: R);
+
+    //fn custom_tag_start<'a, P: IsA<glib::Object> + 'a, Q: Into<Option<&'a P>>>(&self, builder: &Builder, child: Q, tagname: &str, parser: /*Ignored*/glib::MarkupParser, data: /*Unimplemented*/&mut Option<Fundamental: Pointer>) -> bool;
+
+    fn get_internal_child(&self, builder: &Builder, childname: &str) -> Option<glib::Object>;
+
+    fn parser_finished(&self, builder: &Builder);
+
+    fn set_buildable_property(&self, builder: &Builder, name: &str, value: &glib::Value);
+}
+
+impl<O: IsA<Buildable>> BuildableExt for O {
+    fn add_child<'a, P: IsA<glib::Object>, Q: Into<Option<&'a str>>>(&self, builder: &Builder, child: &P, type_: Q) {
+        let type_ = type_.into();
+        let type_ = type_.to_glib_none();
+        unsafe {
+            ffi::gtk_buildable_add_child(self.to_glib_none().0, builder.to_glib_none().0, child.to_glib_none().0, type_.0);
+        }
+    }
+
+    fn construct_child(&self, builder: &Builder, name: &str) -> Option<glib::Object> {
+        unsafe {
+            from_glib_full(ffi::gtk_buildable_construct_child(self.to_glib_none().0, builder.to_glib_none().0, name.to_glib_none().0))
+        }
+    }
+
+    //fn custom_finished<'a, P: IsA<glib::Object> + 'a, Q: Into<Option<&'a P>>, R: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, builder: &Builder, child: Q, tagname: &str, data: R) {
+    //    unsafe { TODO: call ffi::gtk_buildable_custom_finished() }
+    //}
+
+    //fn custom_tag_end<'a, P: IsA<glib::Object> + 'a, Q: Into<Option<&'a P>>, R: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, builder: &Builder, child: Q, tagname: &str, data: R) {
+    //    unsafe { TODO: call ffi::gtk_buildable_custom_tag_end() }
+    //}
+
+    //fn custom_tag_start<'a, P: IsA<glib::Object> + 'a, Q: Into<Option<&'a P>>>(&self, builder: &Builder, child: Q, tagname: &str, parser: /*Ignored*/glib::MarkupParser, data: /*Unimplemented*/&mut Option<Fundamental: Pointer>) -> bool {
+    //    unsafe { TODO: call ffi::gtk_buildable_custom_tag_start() }
+    //}
+
+    fn get_internal_child(&self, builder: &Builder, childname: &str) -> Option<glib::Object> {
+        unsafe {
+            from_glib_none(ffi::gtk_buildable_get_internal_child(self.to_glib_none().0, builder.to_glib_none().0, childname.to_glib_none().0))
+        }
+    }
+
+    fn parser_finished(&self, builder: &Builder) {
+        unsafe {
+            ffi::gtk_buildable_parser_finished(self.to_glib_none().0, builder.to_glib_none().0);
+        }
+    }
+
+    fn set_buildable_property(&self, builder: &Builder, name: &str, value: &glib::Value) {
+        unsafe {
+            ffi::gtk_buildable_set_buildable_property(self.to_glib_none().0, builder.to_glib_none().0, name.to_glib_none().0, value.to_glib_none().0);
+        }
+    }
+}

src/auto/builder.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_10", feature = "dox"))]

src/auto/button.rs

@@ -1,8 +1,9 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use Actionable;
 use Bin;
+use Buildable;
 use Container;
 use PositionType;
 use ReliefStyle;
@@ -24,7 +25,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct Button(Object<ffi::GtkButton, ffi::GtkButtonClass>): Bin, Container, Widget, Actionable;
+    pub struct Button(Object<ffi::GtkButton, ffi::GtkButtonClass>): Bin, Container, Widget, Buildable, Actionable;
 
     match fn {
         get_type => || ffi::gtk_button_get_type(),

src/auto/button_box.rs

@@ -1,7 +1,8 @@
-// This file was generated by gir (0409d73) from gir-files (469db10)
+// This file was generated by gir (e912ccf) from gir-files (469db10)
 // DO NOT EDIT
 
 use Box;
+use Buildable;
 use ButtonBoxStyle;
 use Container;
 use Orientable;
@@ -23,7 +24,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct ButtonBox(Object<ffi::GtkButtonBox, ffi::GtkButtonBoxClass>): Box, Container, Widget, Orientable;
+    pub struct ButtonBox(Object<ffi::GtkButtonBox, ffi::GtkButtonBoxClass>): Box, Container, Widget, Buildable, Orientable;
 
     match fn {
         get_type => || ffi::gtk_button_box_get_type(),