summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test-caja-wrap-table.c5
-rw-r--r--test/test-eel-editable-label.c16
-rw-r--r--test/test-eel-labeled-image.c6
3 files changed, 6 insertions, 21 deletions
diff --git a/test/test-caja-wrap-table.c b/test/test-caja-wrap-table.c
index 463870a6..184e7475 100644
--- a/test/test-caja-wrap-table.c
+++ b/test/test-caja-wrap-table.c
@@ -34,13 +34,8 @@ main (int argc, char* argv[])
GTK_POLICY_AUTOMATIC);
/* Viewport */
-#if GTK_CHECK_VERSION (3, 0, 0)
gtk_container_add (GTK_CONTAINER (scroller),
emblems_table);
-#else
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroller),
- emblems_table);
-#endif
gtk_container_add (GTK_CONTAINER (window), scroller);
diff --git a/test/test-eel-editable-label.c b/test/test-eel-editable-label.c
index f98a81ca..3120a4a9 100644
--- a/test/test-eel-editable-label.c
+++ b/test/test-eel-editable-label.c
@@ -6,11 +6,6 @@
#include <eel/eel-editable-label.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
-#endif
-
-
static void
quit (GtkWidget *widget, gpointer data)
{
@@ -29,7 +24,7 @@ main (int argc, char* argv[])
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (quit), NULL);
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -42,8 +37,8 @@ main (int argc, char* argv[])
label = eel_editable_label_new ("Left aligned label");
-#if GTK_CHECK_VERSION (3, 14, 0)
- gtk_widget_set_halign (label, GTK_ALIGN_START);
+#if GTK_CHECK_VERSION (3, 16, 0)
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
#else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
#endif
@@ -52,9 +47,8 @@ main (int argc, char* argv[])
label = eel_editable_label_new ("Right aligned label");
-#if GTK_CHECK_VERSION (3, 14, 0)
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0);
#else
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
#endif
diff --git a/test/test-eel-labeled-image.c b/test/test-eel-labeled-image.c
index d59d8def..a7e51640 100644
--- a/test/test-eel-labeled-image.c
+++ b/test/test-eel-labeled-image.c
@@ -2,10 +2,6 @@
#include <eel/eel-labeled-image.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
-#endif
-
static const char pixbuf_name[] = "/usr/share/pixmaps/mate-globe.png";
static void
@@ -30,7 +26,7 @@ labeled_image_button_window_new (const char *title,
GtkWidget *plain;
window = test_window_new (title, 20);
- vbox = gtk_vbox_new (FALSE, 10);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_container_add (GTK_CONTAINER (window), vbox);
if (1) button = eel_labeled_image_button_new ("GtkButton with LabeledImage", pixbuf);