From eeabd83f8dd69d19537a717cf6a77819422096d0 Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Mon, 13 Jun 2011 14:33:32 -0700
Subject: Replace Gtk.[HV]Box with Gtk.Box.

---
 caribou/antler/keyboard_view.py        | 6 +++---
 caribou/antler/window.py               | 2 +-
 caribou/settings/preferences_window.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'caribou')

diff --git a/caribou/antler/keyboard_view.py b/caribou/antler/keyboard_view.py
index c5404b7..ea641ec 100644
--- a/caribou/antler/keyboard_view.py
+++ b/caribou/antler/keyboard_view.py
@@ -134,11 +134,11 @@ class AntlerSubLevel(Gtk.Window):
             parent.set_sensitive(True)
             self.hide()
 
-class AntlerLayout(Gtk.HBox):
+class AntlerLayout(Gtk.Box):
     KEY_SPAN = 4
 
     def __init__(self, level=None):
-        gobject.GObject.__init__(self)
+        gobject.GObject.__init__(self, orientation=Gtk.Orientation.HORIZONTAL)
         self.set_spacing(12)
         self._columns = []
         self._keys_map = {}
@@ -160,7 +160,7 @@ class AntlerLayout(Gtk.HBox):
         col.set_row_homogeneous(True)
         col.set_row_spacing(6)
         col.set_column_spacing(6)
-        self.add (col)
+        self.pack_start (col, True, True, 0)
         self._columns.append(col)
         return col
 
diff --git a/caribou/antler/window.py b/caribou/antler/window.py
index e3da33c..e24330d 100644
--- a/caribou/antler/window.py
+++ b/caribou/antler/window.py
@@ -204,7 +204,7 @@ class AntlerWindow(ProximityWindowBase):
         ctx = self.get_style_context()
         ctx.add_class("antler-keyboard-window")
 
-        self._vbox = Gtk.VBox()
+        self._vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.add(self._vbox)
         self.keyboard = text_entry_mech
         self._vbox.pack_start(text_entry_mech, True, True, 0)
diff --git a/caribou/settings/preferences_window.py b/caribou/settings/preferences_window.py
index af1b245..55f9fca 100644
--- a/caribou/settings/preferences_window.py
+++ b/caribou/settings/preferences_window.py
@@ -36,7 +36,7 @@ class AbstractPreferencesUI:
     def _populate_settings(self, parent, setting, level=0):
         if level == 0:
             for s in setting:
-                vbox = Gtk.VBox()
+                vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
                 parent.append_page(vbox, Gtk.Label(label=s.label))
                 self._populate_settings(vbox, s, 1)
         else:
@@ -59,7 +59,7 @@ class AbstractPreferencesUI:
                     label = Gtk.Label()
                     label.set_markup('<b>%s</b>' % s.label)
                     frame.set_label_widget(label)
-                    vbox = Gtk.VBox()
+                    vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
                     frame.add(vbox)
                     parent.pack_start(frame, False, False, 0)
                     self._sensitivity_changed_cb(s, s.sensitive, frame, None)
-- 
cgit v1.2.1