Use gtk_box_new() instead gtk_[v|h]box_new()

[~andy/gtk] / tests / testframe.c

diff --git a/tests/testframe.c b/tests/testframe.c
index b64ec6400d1b39f5de4fcf4c29087d3e767fe748..cf79473402ad762c4e0e05b4b7f5ce5f7d2d7ef0 100644 (file)
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -27,7 +27,7 @@ spin_ythickness_cb (GtkSpinButton *spin, gpointer user_data)
   GtkRcStyle *rcstyle;
 
   rcstyle = gtk_rc_style_new ();
-  rcstyle->xthickness = GTK_WIDGET (frame)->style->xthickness;
+  rcstyle->xthickness = gtk_widget_get_style (frame)->xthickness;
   rcstyle->ythickness = gtk_spin_button_get_value (spin);
   gtk_widget_modify_style (frame, rcstyle);
 
@@ -42,7 +42,7 @@ spin_xthickness_cb (GtkSpinButton *spin, gpointer user_data)
 
   rcstyle = gtk_rc_style_new ();
   rcstyle->xthickness = gtk_spin_button_get_value (spin);
-  rcstyle->ythickness = GTK_WIDGET (frame)->style->ythickness;
+  rcstyle->ythickness = gtk_widget_get_style (frame)->ythickness;
   gtk_widget_modify_style (frame, rcstyle);
 
   g_object_unref (rcstyle);
@@ -67,21 +67,31 @@ double_normalize (gdouble n)
 static void
 spin_xalign_cb (GtkSpinButton *spin, GtkFrame *frame)
 {
-  gdouble xalign = double_normalize (gtk_spin_button_get_value (spin));
-  gtk_frame_set_label_align (frame, xalign, frame->label_yalign);
+  gdouble xalign;
+  gfloat yalign;
+
+  xalign = double_normalize (gtk_spin_button_get_value (spin));
+  gtk_frame_get_label_align (frame, NULL, &yalign);
+  gtk_frame_set_label_align (frame, xalign, yalign);
 }
 
 static void
 spin_yalign_cb (GtkSpinButton *spin, GtkFrame *frame)
 {
-  gdouble yalign = double_normalize (gtk_spin_button_get_value (spin));
-  gtk_frame_set_label_align (frame, frame->label_xalign, yalign);
+  gdouble yalign;
+  gfloat xalign;
+
+  yalign = double_normalize (gtk_spin_button_get_value (spin));
+  gtk_frame_get_label_align (frame, &xalign, NULL);
+  gtk_frame_set_label_align (frame, xalign, yalign);
 }
 
 int main (int argc, char **argv)
 {
+  GtkStyle *style;
   GtkWidget *window, *frame, *xthickness_spin, *ythickness_spin, *vbox;
   GtkWidget *xalign_spin, *yalign_spin, *button, *table, *label;
+  gfloat xalign, yalign;
 
   gtk_init (&argc, &argv);
 
@@ -91,7 +101,7 @@ int main (int argc, char **argv)
 
   g_signal_connect (G_OBJECT (window), "delete-event", gtk_main_quit, NULL);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   frame = gtk_frame_new ("Testing");
@@ -103,13 +113,15 @@ int main (int argc, char **argv)
   table = gtk_table_new (4, 2, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
+  style = gtk_widget_get_style (frame);
+
   /* Spin to control xthickness */
   label = gtk_label_new ("xthickness: ");
   gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
 
   xthickness_spin = gtk_spin_button_new_with_range (0, 250, 1);
   g_signal_connect (G_OBJECT (xthickness_spin), "value-changed", G_CALLBACK (spin_xthickness_cb), frame);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (xthickness_spin), frame->style->xthickness);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (xthickness_spin), style->xthickness);
   gtk_table_attach_defaults (GTK_TABLE (table), xthickness_spin, 1, 2, 0, 1);
 
   /* Spin to control ythickness */
@@ -118,16 +130,18 @@ int main (int argc, char **argv)
 
   ythickness_spin = gtk_spin_button_new_with_range (0, 250, 1);
   g_signal_connect (G_OBJECT (ythickness_spin), "value-changed", G_CALLBACK (spin_ythickness_cb), frame);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (ythickness_spin), frame->style->ythickness);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (ythickness_spin), style->ythickness);
   gtk_table_attach_defaults (GTK_TABLE (table), ythickness_spin, 1, 2, 1, 2);
 
+  gtk_frame_get_label_align (GTK_FRAME (frame), &xalign, &yalign);
+
   /* Spin to control label xalign */
   label = gtk_label_new ("xalign: ");
   gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
 
   xalign_spin = gtk_spin_button_new_with_range (0.0, 1.0, 0.1);
   g_signal_connect (G_OBJECT (xalign_spin), "value-changed", G_CALLBACK (spin_xalign_cb), frame);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (xalign_spin), GTK_FRAME (frame)->label_xalign);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (xalign_spin), xalign);
   gtk_table_attach_defaults (GTK_TABLE (table), xalign_spin, 1, 2, 2, 3);
 
   /* Spin to control label yalign */
@@ -136,7 +150,7 @@ int main (int argc, char **argv)
 
   yalign_spin = gtk_spin_button_new_with_range (0.0, 1.0, 0.1);
   g_signal_connect (G_OBJECT (yalign_spin), "value-changed", G_CALLBACK (spin_yalign_cb), frame);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (yalign_spin), GTK_FRAME (frame)->label_yalign);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (yalign_spin), yalign);
   gtk_table_attach_defaults (GTK_TABLE (table), yalign_spin, 1, 2, 3, 4);
 
   gtk_widget_show_all (window);