From 046983bd5c75f2b57a707d06b08abc4b715c236c Mon Sep 17 00:00:00 2001 From: Harald Judt Date: Mon, 28 May 2012 09:57:23 +0200 Subject: Use xfce_hvbox instead of gtk_vbox/gtk_hbox. --- panel-plugin/systemload.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c index 183d29b..66b7c11 100644 --- a/panel-plugin/systemload.c +++ b/panel-plugin/systemload.c @@ -244,14 +244,9 @@ monitor_update_orientation (XfcePanelPlugin *plugin, gtk_container_remove(GTK_CONTAINER(global->ebox), GTK_WIDGET(global->box)); - if (panel_orientation == GTK_ORIENTATION_HORIZONTAL) - { - global->box = gtk_hbox_new(FALSE, 0); - } - else - { - global->box = gtk_vbox_new(FALSE, 0); - } + global->box = xfce_hvbox_new(orientation, FALSE, 0); + xfce_hvbox_set_orientation(XFCE_HVBOX(global->box), orientation); + gtk_widget_show(global->box); for(count = 0; count < 3; count++) @@ -263,16 +258,11 @@ monitor_update_orientation (XfcePanelPlugin *plugin, global->monitor[count]->status = GTK_WIDGET(gtk_progress_bar_new()); - if (panel_orientation == GTK_ORIENTATION_HORIZONTAL) - { - global->monitor[count]->box = GTK_WIDGET(gtk_hbox_new(FALSE, 0)); - gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(global->monitor[count]->status), GTK_PROGRESS_BOTTOM_TO_TOP); - } - else - { - global->monitor[count]->box = GTK_WIDGET(gtk_vbox_new(FALSE, 0)); - gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(global->monitor[count]->status), GTK_PROGRESS_LEFT_TO_RIGHT); - } + global->monitor[count]->box = xfce_hvbox_new(orientation, FALSE, 0); + xfce_hvbox_set_orientation(XFCE_HVBOX(global->monitor[count]->box), orientation); + gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(global->monitor[count]->status), + (panel_orientation == GTK_ORIENTATION_HORIZONTAL) + ? GTK_PROGRESS_BOTTOM_TO_TOP : GTK_PROGRESS_LEFT_TO_RIGHT); gtk_box_pack_start(GTK_BOX(global->monitor[count]->box), GTK_WIDGET(global->monitor[count]->label), -- 1.7.8.6