From b2f651e0806c231eaa4110b023429cbacf8ce019 Mon Sep 17 00:00:00 2001 From: Hans Baier Date: Thu, 25 Oct 2012 14:26:39 +0700 Subject: [PATCH] Remove uses of deprecated HBox/VBox Fix Knob size request --- demos/KnobDemo.vala | 6 +++--- demos/TransportButtonDemo.vala | 4 ++-- src/Knob.vala | 1 + src/KnobWithDisplay.vala | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/demos/KnobDemo.vala b/demos/KnobDemo.vala index bc46954..71fcc37 100644 --- a/demos/KnobDemo.vala +++ b/demos/KnobDemo.vala @@ -10,7 +10,7 @@ namespace Prolooks { static int main (string[] args) { Gtk.init (ref args); var window = new Window (WindowType.TOPLEVEL); - var hbox = new HBox (false, 0); + var hbox = new Box (Gtk.Orientation.HORIZONTAL, 0); for (int i = 0; i <= (int)KnobMode.ENDLESS * 2 + 1; i++) { Knob knob = new Knob (); knob.knob_mode = (KnobMode)i % (int)KnobMode.ENDLESS; @@ -22,14 +22,14 @@ namespace Prolooks { isource.led_color = color_from_string ("#ffff00"); knob.image_source = isource; } - hbox.add (knob); + hbox.pack_start (knob); } Knob thorwil_knob = new Knob (); var isource = new ThorwilKnobImageSource (); isource.lamp_color = color_from_string ("#9fc717"); thorwil_knob.image_source = isource; - hbox.add (thorwil_knob); + hbox.pack_start (thorwil_knob); window.add (hbox); window.destroy.connect(Gtk.main_quit); diff --git a/demos/TransportButtonDemo.vala b/demos/TransportButtonDemo.vala index 763acf0..c1c184d 100644 --- a/demos/TransportButtonDemo.vala +++ b/demos/TransportButtonDemo.vala @@ -49,8 +49,8 @@ public class TransportButtons : TransportButton { static int main (string[] args) { Gtk.init (ref args); var window = new Gtk.Window (Gtk.WindowType.TOPLEVEL); - var vbox = new Gtk.VBox (false, 0); - var hbox = new Gtk.HBox (false, 0); + var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); + var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0); var widget = new TransportButtons (); vbox.add (widget); diff --git a/src/Knob.vala b/src/Knob.vala index 23a6569..ce8f9d3 100644 --- a/src/Knob.vala +++ b/src/Knob.vala @@ -38,6 +38,7 @@ public class Knob : Range { var isource = new SimpleKnobImageSource (); isource.led_color = color_from_string ("#9fc717"); _image_source = isource; + set_size_request((int)image_source.get_knob_width (), (int)image_source.get_knob_height ()); } return _image_source; } diff --git a/src/KnobWithDisplay.vala b/src/KnobWithDisplay.vala index a5c13ca..60bcee3 100644 --- a/src/KnobWithDisplay.vala +++ b/src/KnobWithDisplay.vala @@ -8,7 +8,7 @@ using Gtk; namespace Prolooks { public class KnobWithDisplay : EventBox { - private VBox vbox; + private Box vbox; private Knob knob; private ValueDisplay display; @@ -32,11 +32,11 @@ public class KnobWithDisplay : EventBox { public uint decimal_places { get { return knob.decimal_places; } set { knob.decimal_places = value; } } construct { - vbox = new VBox (false, 0); + vbox = new Box (Gtk.Orientation.VERTICAL, 0); knob = new Knob (); - vbox.add (knob); + vbox.pack_start (knob); display = new ValueDisplay (); - vbox.add (display); + vbox.pack_start (display); knob.user_data = display; decimal_places = 2; var adj = knob.get_adjustment (); -- 2.11.4.GIT