diff options
| author | Timm Bäder <mail@baedert.org> | 2016-10-15 17:43:56 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2016-10-18 00:29:19 +0200 |
| commit | dece0189945d1d6c16f362be76d1c70f00ecc9ba (patch) | |
| tree | 442e1b0bec860b0ca0e3abe01cdbf04d761583b6 /tests | |
| parent | e0d50233f6971612d74bf498c59dbeb1f32a9633 (diff) | |
| download | gtk+-dece0189945d1d6c16f362be76d1c70f00ecc9ba.tar.gz | |
Remove GtkAlignment
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testadjustsize.c | 32 | ||||
| -rw-r--r-- | tests/testheightforwidth.c | 11 |
2 files changed, 3 insertions, 40 deletions
diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c index f3aa635f72..f7f977267b 100644 --- a/tests/testadjustsize.c +++ b/tests/testadjustsize.c @@ -26,7 +26,6 @@ enum { TEST_WIDGET_LABEL, TEST_WIDGET_VERTICAL_LABEL, TEST_WIDGET_WRAP_LABEL, - TEST_WIDGET_ALIGNMENT, TEST_WIDGET_IMAGE, TEST_WIDGET_BUTTON, TEST_WIDGET_LAST @@ -64,36 +63,6 @@ create_button (void) return gtk_button_new_with_label ("BUTTON!"); } -static gboolean -on_draw_alignment (GtkWidget *widget, - cairo_t *cr, - void *data) -{ - cairo_set_source_rgb (cr, 1.0, 0.0, 0.0); - cairo_paint (cr); - - return FALSE; -} - -static GtkWidget* -create_alignment (void) -{ - GtkWidget *alignment; - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); -G_GNUC_END_IGNORE_DEPRECATIONS - - /* make the alignment visible */ - gtk_widget_set_redraw_on_allocate (alignment, TRUE); - g_signal_connect (G_OBJECT (alignment), - "draw", - G_CALLBACK (on_draw_alignment), - NULL); - - return alignment; -} - static void open_test_window (void) { @@ -113,7 +82,6 @@ open_test_window (void) test_widgets[TEST_WIDGET_VERTICAL_LABEL] = create_label (TRUE, FALSE); test_widgets[TEST_WIDGET_WRAP_LABEL] = create_label (FALSE, TRUE); test_widgets[TEST_WIDGET_BUTTON] = create_button (); - test_widgets[TEST_WIDGET_ALIGNMENT] = create_alignment (); grid = gtk_grid_new (); diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c index 66e9531701..444a201370 100644 --- a/tests/testheightforwidth.c +++ b/tests/testheightforwidth.c @@ -634,15 +634,10 @@ TestInterface interfaces[] = { " <property name=\"visible\">True</property>" " <property name=\"label_xalign\">0</property>" " <child>" - " <object class=\"GtkAlignment\" id=\"alignment1\">" + " <object class=\"GtkLabel\" id=\"label2\">" " <property name=\"visible\">True</property>" - " <property name=\"left_padding\">12</property>" - " <child>" - " <object class=\"GtkLabel\" id=\"label2\">" - " <property name=\"visible\">True</property>" - " <property name=\"label\" translatable=\"yes\">some content</property>" - " </object>" - " </child>" + " <property name=\"margin-start\">12</property>" + " <property name=\"label\" translatable=\"yes\">some content</property>" " </object>" " </child>" " <child type=\"label\">" |