From 92d747795412ab86e26b5b657c1335bdc71b0c70 Mon Sep 17 00:00:00 2001 From: Hans Baier Date: Thu, 25 Oct 2012 15:35:21 +0700 Subject: [PATCH] Fix can_focus / remove deprecated HBox/VBox --- demos/DisplayDemo.vala | 2 +- demos/KnobWithDisplayDemo.vala | 11 ++++++++--- demos/ValueDisplayDemo.vala | 4 ++-- src/Keyboard.vala | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/demos/DisplayDemo.vala b/demos/DisplayDemo.vala index 9858b33..659db80 100644 --- a/demos/DisplayDemo.vala +++ b/demos/DisplayDemo.vala @@ -68,7 +68,7 @@ public class TestDisplay : DisplayBase { Gtk.init (ref args); var window = new Gtk.Window (Gtk.WindowType.TOPLEVEL); - var vbox = new VBox(false, 2); + var vbox = new Box(Gtk.Orientation.VERTICAL, 2); var resize_button = new Button.with_label("Resize"); var matrix_button = new ToggleButton.with_label("Show Matrix"); var glass_rim_button = new ToggleButton.with_label("Show glass rim"); diff --git a/demos/KnobWithDisplayDemo.vala b/demos/KnobWithDisplayDemo.vala index 499360c..ddbc695 100644 --- a/demos/KnobWithDisplayDemo.vala +++ b/demos/KnobWithDisplayDemo.vala @@ -11,11 +11,16 @@ namespace Prolooks { Gtk.init (ref args); var window = new Window (WindowType.TOPLEVEL); - var vbox = new VBox (false, 0); + var hbox = new Box (Gtk.Orientation.HORIZONTAL, 0); var knob = new KnobWithDisplay (); knob.decimal_places = 1; - vbox.add (knob); - window.add (vbox); + hbox.pack_end (knob); + + knob = new KnobWithDisplay (); + knob.decimal_places = 1; + hbox.pack_end (knob); + + window.add (hbox); window.destroy.connect(Gtk.main_quit); window.show_all (); Gtk.main (); diff --git a/demos/ValueDisplayDemo.vala b/demos/ValueDisplayDemo.vala index a22987a..406102b 100644 --- a/demos/ValueDisplayDemo.vala +++ b/demos/ValueDisplayDemo.vala @@ -11,11 +11,11 @@ namespace Prolooks { Gtk.init (ref args); var window = new Window (WindowType.TOPLEVEL); - var vbox = new VBox (false, 0); + var vbox = new Box (Gtk.Orientation.VERTICAL, 0); Knob knob = new Knob (); vbox.add (knob); var display = new ValueDisplay (); - vbox.add (display); + vbox.pack_end (display); knob.user_data = display; knob.value_changed += (knob) => { ValueDisplay disp = knob.user_data as ValueDisplay; diff --git a/src/Keyboard.vala b/src/Keyboard.vala index af4cb8d..7f908ec 100644 --- a/src/Keyboard.vala +++ b/src/Keyboard.vala @@ -53,7 +53,7 @@ public class Keyboard : DrawingArea { construct { - //XXX set_flags (WidgetFlags.CAN_FOCUS); + set_can_focus(true); nkeys = 7 * 3 + 1; last_key = -1; add_events (Gdk.EventMask.EXPOSURE_MASK | Gdk.EventMask.BUTTON1_MOTION_MASK | -- 2.11.4.GIT