aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Brendan Taylor <whateley@gmail.com>2011-09-11 21:32:50 +0000
committerGravatar Brendan Taylor <whateley@gmail.com>2011-09-11 21:32:50 +0000
commitd9d2cf8190c0f5ac9ed5f009c8ef6b52f78912a7 (patch)
treebdd73dcfde438899dc0259af4a942fb958b2a260 /src
parent5ad69c8be2eec48fec103d8b7aeac098082e7e02 (diff)
GTK+ 3.1 has deprecated VBox and HBox
Diffstat (limited to 'src')
-rw-r--r--src/status-bar.c2
-rw-r--r--src/status-bar.h4
-rw-r--r--src/uzbl-core.c6
3 files changed, 9 insertions, 3 deletions
diff --git a/src/status-bar.c b/src/status-bar.c
index 6d4541b..d80dd51 100644
--- a/src/status-bar.c
+++ b/src/status-bar.c
@@ -1,6 +1,6 @@
#include "status-bar.h"
-G_DEFINE_TYPE (UzblStatusBar, uzbl_status_bar, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (UzblStatusBar, uzbl_status_bar, GTK_TYPE_BOX)
static void uzbl_status_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
diff --git a/src/status-bar.h b/src/status-bar.h
index e972701..cae8905 100644
--- a/src/status-bar.h
+++ b/src/status-bar.h
@@ -14,14 +14,14 @@ typedef struct _UzblStatusBar UzblStatusBar;
typedef struct _UzblStatusBarClass UzblStatusBarClass;
struct _UzblStatusBar {
- GtkHBox hbox;
+ GtkBox box;
GtkWidget *left_label;
GtkWidget *right_label;
};
struct _UzblStatusBarClass {
- GtkHBoxClass parent_class;
+ GtkBoxClass parent_class;
};
GType uzbl_status_bar_get_type (void) G_GNUC_CONST;
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index af60767..92ef746 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -1029,7 +1029,13 @@ initialize(int argc, char** argv) {
create_scrolled_win();
/* pack the window and the status bar */
+
+#if GTK_CHECK_VERSION(3,0,0)
+ uzbl.gui.vbox = gtk_box_new(FALSE, 0);
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(uzbl.gui.vbox), GTK_ORIENTATION_VERTICAL);
+#else
uzbl.gui.vbox = gtk_vbox_new(FALSE, 0);
+#endif
gtk_box_pack_start(GTK_BOX(uzbl.gui.vbox), uzbl.gui.scrolled_win, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(uzbl.gui.vbox), uzbl.gui.status_bar, FALSE, TRUE, 0);