X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-means-layer.c;h=255dc6dfe701a456d680a8ace20add12db2b019c;hb=refs%2Fheads%2Fctables7;hp=8046b00765e2a42d6371fa1a96f71bf462c80820;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp

diff --git a/src/ui/gui/psppire-means-layer.c b/src/ui/gui/psppire-means-layer.c
index 8046b00765..255dc6dfe7 100644
--- a/src/ui/gui/psppire-means-layer.c
+++ b/src/ui/gui/psppire-means-layer.c
@@ -29,14 +29,14 @@
 static void psppire_means_layer_class_init    (PsppireMeansLayerClass *class);
 static void psppire_means_layer_init          (PsppireMeansLayer      *window);
 
-G_DEFINE_TYPE (PsppireMeansLayer, psppire_means_layer, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (PsppireMeansLayer, psppire_means_layer, GTK_TYPE_BOX);
 
 static GObjectClass *parent_class = NULL;
 
 static void
 psppire_means_layer_dispose (GObject *obj)
 {
-  PsppireMeansLayer *w = (PsppireMeansLayer *)obj;
+  PsppireMeansLayer *w = PSPPIRE_MEANS_LAYER (obj);
 
   if (w->dispose_has_run)
     return;
@@ -51,7 +51,7 @@ psppire_means_layer_dispose (GObject *obj)
 }
 
 
-static void 
+static void
 psppire_means_layer_class_init    (PsppireMeansLayerClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
@@ -79,7 +79,7 @@ add_new_layer (PsppireMeansLayer *ml)
   GtkTreeModel *tm = gtk_tree_view_get_model (GTK_TREE_VIEW (ml->var_view));
   g_ptr_array_add (ml->layer, tm);
   g_signal_connect_swapped (tm, "row-inserted", G_CALLBACK (refresh_view), ml);
-  
+
   g_object_ref (tm);
 }
 
@@ -94,7 +94,7 @@ psppire_means_layer_update (PsppireMeansLayer *ml)
 
   l = g_strdup_printf (_("Layer %d of %d"),
 			      ml->current_layer + 1, ml->n_layers);
-  
+
   gtk_label_set_text (GTK_LABEL (ml->label), l);
   g_free (l);
 
@@ -105,7 +105,7 @@ psppire_means_layer_update (PsppireMeansLayer *ml)
     GtkTreeModel *tm = g_ptr_array_index (ml->layer, ml->current_layer);
 
     g_return_if_fail (GTK_IS_TREE_MODEL (tm));
-    
+
     gtk_widget_set_sensitive (ml->forward,
 			      gtk_tree_model_get_iter_first (tm, &dummy));
   }
@@ -156,17 +156,18 @@ psppire_means_layer_clear (PsppireMeansLayer *ml)
   psppire_means_layer_update (ml);
 }
 
-static void 
+static void
 psppire_means_layer_init  (PsppireMeansLayer      *ml)
 {
-  GtkWidget *hbox_upper = gtk_hbox_new (FALSE, 5);
-  GtkWidget *hbox_lower = gtk_hbox_new (FALSE, 5);
-  GtkWidget *alignment = gtk_alignment_new (0, 0.5, 0, 0);
+  GtkWidget *hbox_upper = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+  GtkWidget *hbox_lower = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
   GtkWidget *sw = gtk_scrolled_window_new (NULL, NULL);
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (ml), GTK_ORIENTATION_VERTICAL);
+
   ml->dispose_has_run = FALSE;
-  ml->forward = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
-  ml->back = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
+  ml->forward = gtk_button_new_with_label (_("Forward"));
+  ml->back = gtk_button_new_with_label (_("Back"));
   ml->var_view = psppire_var_view_new ();
   ml->label = gtk_label_new ("");
 
@@ -188,7 +189,6 @@ psppire_means_layer_init  (PsppireMeansLayer      *ml)
   gtk_box_pack_start (GTK_BOX (hbox_upper), ml->label, TRUE, FALSE, 5);
   gtk_box_pack_start (GTK_BOX (hbox_upper), ml->forward, FALSE, FALSE, 5);
 
-  gtk_box_pack_start (GTK_BOX (hbox_lower), alignment, FALSE, FALSE, 5);
   gtk_box_pack_start (GTK_BOX (hbox_lower), sw, TRUE, TRUE, 5);
   gtk_container_add (GTK_CONTAINER (sw), ml->var_view);