From 604f4cf8bf143efa8223e21981933ae62314edc1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 13 May 2020 15:52:00 -0400 Subject: [PATCH] tests: Drop testcolorchooser2 This tests an embedded colorchooser. Just like we have in widget-factory. And it doesn't work in !srcdir builds, so it can go. See: #2738 --- tests/meson.build | 1 - tests/testcolorchooser2.c | 60 -------------------------------------- tests/testcolorchooser2.ui | 29 ------------------ 3 files changed, 90 deletions(-) delete mode 100644 tests/testcolorchooser2.c delete mode 100644 tests/testcolorchooser2.ui diff --git a/tests/meson.build b/tests/meson.build index c5aeb78cc7..356540184a 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -22,7 +22,6 @@ gtk_tests = [ ['testcalendar'], ['testclipboard2'], ['testcolorchooser'], - ['testcolorchooser2'], ['testcombo'], ['testcombochange'], ['testcellrenderertext'], diff --git a/tests/testcolorchooser2.c b/tests/testcolorchooser2.c deleted file mode 100644 index 4309d9c754..0000000000 --- a/tests/testcolorchooser2.c +++ /dev/null @@ -1,60 +0,0 @@ -#include - -static void rgba_changed (GtkColorChooser *chooser, GParamSpec *pspec, gpointer data); - -static void -text_activated (GtkEntry *entry, gpointer data) -{ - GtkColorChooser *chooser = data; - GdkRGBA rgba; - const char *text; - - text = gtk_editable_get_text (GTK_EDITABLE (entry)); - - g_signal_handlers_block_by_func (entry, rgba_changed, entry); - if (gdk_rgba_parse (&rgba, text)) - gtk_color_chooser_set_rgba (chooser, &rgba); - g_signal_handlers_unblock_by_func (entry, rgba_changed, entry); -} - -static void -rgba_changed (GtkColorChooser *chooser, GParamSpec *pspec, gpointer data) -{ - GtkWidget *entry = data; - GdkRGBA color; - char *s; - - gtk_color_chooser_get_rgba (chooser, &color); - s = gdk_rgba_to_string (&color); - - g_signal_handlers_block_by_func (entry, text_activated, chooser); - gtk_editable_set_text (GTK_EDITABLE (entry), s); - g_signal_handlers_unblock_by_func (entry, text_activated, chooser); - - g_free (s); -} - -int main (int argc, char *argv[]) -{ - GtkWidget *window; - GtkWidget *chooser; - GtkWidget *entry; - GtkBuilder *builder; - - gtk_init (); - - builder = gtk_builder_new_from_file ("testcolorchooser2.ui"); - window = GTK_WIDGET (gtk_builder_get_object (builder, "window1")); - chooser = GTK_WIDGET (gtk_builder_get_object (builder, "chooser")); - entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry")); - - g_signal_connect (chooser, "notify::rgba", G_CALLBACK (rgba_changed), entry); - g_signal_connect (entry, "activate", G_CALLBACK (text_activated), chooser); - - gtk_widget_show (window); - - while (TRUE) - g_main_context_iteration (NULL, TRUE); - - return 0; -} diff --git a/tests/testcolorchooser2.ui b/tests/testcolorchooser2.ui deleted file mode 100644 index 398dc4e25c..0000000000 --- a/tests/testcolorchooser2.ui +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - 1 - horizontal - center - center - 10 - - - 1 - start - unknown - 25 - 25 - - - - - 1 - 1 - - - - - -