From: Alan Knowles Date: Fri, 28 Dec 2018 06:53:35 +0000 (+0800) Subject: MergeBranch.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=801ebdcb0e618b3106f5c57e5cc92f87ff48cbca MergeBranch.bjs MergeBranch.vala --- diff --git a/MergeBranch.bjs b/MergeBranch.bjs index 4347d6f3..122275f0 100644 --- a/MergeBranch.bjs +++ b/MergeBranch.bjs @@ -142,7 +142,14 @@ "* pack" : "add", "xtype" : "Notebook", "$ xns" : "Gtk", - "bool vexpand" : true + "bool vexpand" : true, + "items" : [ + { + "* pack" : "get_path_for_child", + "xtype" : "Label", + "$ xns" : "Gtk" + } + ] }, { "int height_request" : 500, diff --git a/MergeBranch.vala b/MergeBranch.vala index 1835f5fb..49e5db93 100644 --- a/MergeBranch.vala +++ b/MergeBranch.vala @@ -48,10 +48,10 @@ public class MergeBranch : Object var child_0 = new Xcls_Box2( _this ); child_0.ref(); this.el.get_content_area().add ( child_0.el ); - var child_1 = new Xcls_Button18( _this ); + var child_1 = new Xcls_Button19( _this ); child_1.ref(); this.el.add_action_widget ( child_1.el , 0 ); - var child_2 = new Xcls_Button19( _this ); + var child_2 = new Xcls_Button20( _this ); child_2.ref(); this.el.add_action_widget ( child_2.el , 1 ); @@ -668,11 +668,36 @@ public class MergeBranch : Object // set gobject values this.el.vexpand = true; + var child_0 = new Xcls_Label15( _this ); + child_0.ref(); + this.el.get_path_for_child ( child_0.el ); + } + + // user defined functions + } + public class Xcls_Label15 : Object + { + public Gtk.Label el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Label15(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Label( null ); + + // my vars (dec) + + // set gobject values } // user defined functions } + public class Xcls_scrolled_window : Object { public Gtk.ScrolledWindow el; @@ -776,7 +801,7 @@ public class MergeBranch : Object } - public class Xcls_Button18 : Object + public class Xcls_Button19 : Object { public Gtk.Button el; private MergeBranch _this; @@ -785,7 +810,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button18(MergeBranch _owner ) + public Xcls_Button19(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -800,7 +825,7 @@ public class MergeBranch : Object // user defined functions } - public class Xcls_Button19 : Object + public class Xcls_Button20 : Object { public Gtk.Button el; private MergeBranch _this; @@ -809,7 +834,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button19(MergeBranch _owner ) + public Xcls_Button20(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Button();