Changes required for gtk3 upgrade

[app.Builder.js] / Builder3 / Editor.js

diff --git a/Builder3/Editor.js b/Builder3/Editor.js
index 6bad275..e399f9f 100644 (file)
--- a/Builder3/Editor.js
+++ b/Builder3/Editor.js
@@ -8,8 +8,7 @@ GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
 GtkClutter = imports.gi.GtkClutter;
-Gdl = imports.gi.Gdl;
-console = imports.console;
+ console = imports.console;
 XObject = imports.XObject.XObject;
 Editor=new XObject({
     xtype: Gtk.Window,
@@ -58,13 +57,14 @@ Editor=new XObject({
             pack : "add",
             items : [
                 {
-                    xtype: Gtk.Toolbar,
+                    xtype: Gtk.MenuBar,
                     pack : "pack_start,false,true",
                     items : [
                         {
-                            xtype: Gtk.Button,
+                            xtype: Gtk.MenuItem,
+                             
                             listeners : {
-                                clicked : function (self) {
+                                activate : function (self) {
                                 
                                   this.get('/Editor.RightEditor').save();
                                 }
@@ -117,7 +117,7 @@ Editor=new XObject({
                             auto_indent : true,
                             init : function() {
                                 XObject.prototype.init.call(this);
-                                 var description = Pango.Font.description_from_string("monospace")
+                                 var description = Pango.font_description_from_string("monospace")
                                 description.set_size(8000);
                                 this.el.modify_font(description);
                             
@@ -136,19 +136,19 @@ Editor=new XObject({
                                 this.el.get_buffer().set_language(lm.get_language('js'));
                                 var buf = this.el.get_buffer();
                                 var cursor = buf.get_mark("insert");
-                                var iter= new Gtk.TextIter;
-                                buf.get_iter_at_mark(iter, cursor);
-                                iter.set_line(1);
-                                iter.set_line_offset(4);
-                                buf.move_mark(cursor, iter);
+                                var ret = {};
+                                buf.get_iter_at_mark(ret, cursor);
+                                ret.iter.set_line(1);
+                                ret.iter.set_line_offset(4);
+                                buf.move_mark(cursor, ret.iter);
                                 
                                 
                                 cursor = buf.get_mark("selection_bound");
-                                iter= new Gtk.TextIter;
-                                buf.get_iter_at_mark(iter, cursor);
-                                iter.set_line(1);
-                                iter.set_line_offset(4);
-                                buf.move_mark(cursor, iter);
+                                ret = {}; 
+                                buf.get_iter_at_mark(ret, cursor);
+                                ret.iter.set_line(1);
+                                ret.iter.set_line_offset(4);
+                                buf.move_mark(cursor, ret.iter);
                                 this.get('/Editor').dirty = false;
                                 this.el.grab_focus();
                                  this.get('/Editor.save_button').el.sensitive = false;
@@ -202,12 +202,13 @@ Editor=new XObject({
                                         return true;
                                     },
                                     toString : function() {
+                                        var s = {};
+                                        var e = {};
+                                         
+                                        this.el.get_start_iter(s).value;
+                                        this.el.get_end_iter(e).value;
                                         
-                                        var s = new Gtk.TextIter();
-                                        var e = new Gtk.TextIter();
-                                        this.el.get_start_iter(s);
-                                        this.el.get_end_iter(e);
-                                        var ret = this.el.get_text(s,e,true);
+                                        var ret = this.el.get_text(s.iter,e.iter,true);
                                         //print("TO STRING? " + ret);
                                         return ret;
                                     }