X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Ftestcellarea.c;h=7064637efcb254b0a93f2cc488c9ddec17792580;hb=515499d949270c83b00fa66f68e1fef78c57c1b2;hp=e0fd00edae54ee02431c58c479ee63e1df141e6e;hpb=e7c4ede64c1ad29a83cd0900c0e4e128ed39f2ec;p=~andy%2Fgtk diff --git a/tests/testcellarea.c b/tests/testcellarea.c index e0fd00eda..7064637ef 100644 --- a/tests/testcellarea.c +++ b/tests/testcellarea.c @@ -96,12 +96,12 @@ simple_scaffold (void) area = cell_area_scaffold_get_area (CELL_AREA_SCAFFOLD (scaffold)); cell_1 = renderer = gtk_cell_renderer_text_new (); - gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, FALSE, FALSE); + gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, FALSE, FALSE, FALSE); gtk_cell_area_attribute_connect (area, renderer, "text", SIMPLE_COLUMN_NAME); cell_2 = renderer = gtk_cell_renderer_pixbuf_new (); g_object_set (G_OBJECT (renderer), "xalign", 0.0F, NULL); - gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, TRUE, FALSE); + gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, TRUE, FALSE, FALSE); gtk_cell_area_attribute_connect (area, renderer, "stock-id", SIMPLE_COLUMN_ICON); cell_3 = renderer = gtk_cell_renderer_text_new (); @@ -109,7 +109,7 @@ simple_scaffold (void) "wrap-mode", PANGO_WRAP_WORD, "wrap-width", 215, NULL); - gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, FALSE, TRUE); + gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, FALSE, TRUE, FALSE); gtk_cell_area_attribute_connect (area, renderer, "text", SIMPLE_COLUMN_DESCRIPTION); return scaffold; @@ -119,9 +119,10 @@ static void orientation_changed (GtkComboBox *combo, CellAreaScaffold *scaffold) { + GtkCellArea *area = cell_area_scaffold_get_area (scaffold); GtkOrientation orientation = gtk_combo_box_get_active (combo); - gtk_orientable_set_orientation (GTK_ORIENTABLE (scaffold), orientation); + gtk_orientable_set_orientation (GTK_ORIENTABLE (area), orientation); } static void @@ -186,7 +187,7 @@ simple_cell_area (void) scaffold = simple_scaffold (); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); frame = gtk_frame_new (NULL); gtk_widget_show (hbox); gtk_widget_show (frame); @@ -199,7 +200,7 @@ simple_cell_area (void) gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE, 0); /* Now add some controls */ - vbox = gtk_vbox_new (FALSE, 4); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4); gtk_widget_show (vbox); gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); @@ -359,7 +360,7 @@ focus_scaffold (gboolean color_bg, GtkCellRenderer **focus, GtkCellRenderer **si renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); - gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, TRUE, FALSE); + gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, TRUE, FALSE, FALSE); gtk_cell_area_attribute_connect (area, renderer, "text", FOCUS_COLUMN_NAME); if (color_bg) @@ -370,7 +371,7 @@ focus_scaffold (gboolean color_bg, GtkCellRenderer **focus, GtkCellRenderer **si toggle = renderer = gtk_cell_renderer_toggle_new (); g_object_set (G_OBJECT (renderer), "xalign", 0.0F, NULL); - gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, FALSE, TRUE); + gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, FALSE, TRUE, FALSE); gtk_cell_area_attribute_connect (area, renderer, "active", FOCUS_COLUMN_CHECK); if (color_bg) @@ -394,7 +395,7 @@ focus_scaffold (gboolean color_bg, GtkCellRenderer **focus, GtkCellRenderer **si if (sibling) *sibling = renderer; - gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, FALSE, TRUE); + gtk_cell_area_box_pack_start (GTK_CELL_AREA_BOX (area), renderer, FALSE, TRUE, FALSE); gtk_cell_area_attribute_connect (area, renderer, "text", FOCUS_COLUMN_STATIC_TEXT); gtk_cell_area_add_focus_sibling (area, toggle, renderer); @@ -425,7 +426,7 @@ focus_cell_area (void) GtkWidget *scaffold, *frame, *vbox, *hbox; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_widget_show (hbox); gtk_window_set_title (GTK_WINDOW (window), "Focus and editable cells"); @@ -443,7 +444,7 @@ focus_cell_area (void) gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE, 0); /* Now add some controls */ - vbox = gtk_vbox_new (FALSE, 4); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4); gtk_widget_show (vbox); gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); @@ -498,24 +499,6 @@ row_spacing_changed (GtkSpinButton *spin_button, cell_area_scaffold_set_row_spacing (scaffold, value); } -static void -cell_margins_changed (GtkSpinButton *spin_button, - CellAreaScaffold *scaffold) -{ - GtkCellArea *area = cell_area_scaffold_get_area (scaffold); - gint value; - - value = (gint)gtk_spin_button_get_value (spin_button); - - gtk_cell_area_set_cell_margin_left (area, value); - gtk_cell_area_set_cell_margin_right (area, value); - gtk_cell_area_set_cell_margin_top (area, value); - gtk_cell_area_set_cell_margin_bottom (area, value); - - gtk_widget_queue_resize (GTK_WIDGET (scaffold)); -} - - static void indentation_changed (GtkSpinButton *spin_button, CellAreaScaffold *scaffold) @@ -534,8 +517,8 @@ background_area (void) GtkWidget *scaffold, *frame, *vbox, *hbox; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - hbox = gtk_hbox_new (FALSE, 4); - main_vbox = gtk_vbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4); gtk_widget_show (hbox); gtk_widget_show (main_vbox); gtk_container_add (GTK_CONTAINER (window), main_vbox); @@ -544,8 +527,7 @@ background_area (void) label = gtk_label_new ("In this example, row spacing gets devided into the background area, " "column spacing is added between each background area, indentation is " - "prepended space distributed to the background area, individual cell margins " - "are also distributed to the background area for every cell."); + "prepended space distributed to the background area."); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_width_chars (GTK_LABEL (label), 40); gtk_widget_show (label); @@ -564,7 +546,7 @@ background_area (void) gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE, 0); /* Now add some controls */ - vbox = gtk_vbox_new (FALSE, 4); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4); gtk_widget_show (vbox); gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); @@ -581,7 +563,7 @@ background_area (void) widget = gtk_spin_button_new_with_range (0, 10, 1); label = gtk_label_new ("Cell spacing"); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_widget_show (hbox); gtk_widget_show (label); gtk_widget_show (widget); @@ -595,7 +577,7 @@ background_area (void) widget = gtk_spin_button_new_with_range (0, 10, 1); label = gtk_label_new ("Row spacing"); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_widget_show (hbox); gtk_widget_show (label); gtk_widget_show (widget); @@ -606,22 +588,9 @@ background_area (void) g_signal_connect (G_OBJECT (widget), "value-changed", G_CALLBACK (row_spacing_changed), scaffold); - widget = gtk_spin_button_new_with_range (0, 10, 1); - label = gtk_label_new ("Cell Margins"); - hbox = gtk_hbox_new (FALSE, 4); - gtk_widget_show (hbox); - gtk_widget_show (label); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - - g_signal_connect (G_OBJECT (widget), "value-changed", - G_CALLBACK (cell_margins_changed), scaffold); - widget = gtk_spin_button_new_with_range (0, 30, 1); label = gtk_label_new ("Intentation"); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_widget_show (hbox); gtk_widget_show (label); gtk_widget_show (widget); @@ -645,6 +614,9 @@ main (int argc, char *argv[]) { gtk_init (NULL, NULL); + if (g_getenv ("RTL")) + gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL); + simple_cell_area (); focus_cell_area (); background_area ();