X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tests%2Ftest-close.c;h=8f902e6cef7030130371a59e010444a1fa35da78;hb=0c5e51127206d26290a8e1e1349ab37d847d1d84;hp=68ea15f1a9bf8487cf2bc7ea12f4fc07ae3f8077;hpb=4dc162f4e4f52b69f9fa6008999c1bda338306e2;p=projects%2Fchimara%2Fchimara.git diff --git a/tests/test-close.c b/tests/test-close.c index 68ea15f..8f902e6 100644 --- a/tests/test-close.c +++ b/tests/test-close.c @@ -33,8 +33,6 @@ main(int argc, char *argv[]) GtkWidget *window, *vbox, *hbox, *stop, *go, *glk; /* Initialize threads and GTK */ - if(!g_thread_supported()) - g_thread_init(NULL); gdk_threads_init(); gtk_init(&argc, &argv); @@ -43,10 +41,14 @@ main(int argc, char *argv[]) window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size(GTK_WINDOW(window), 400, 400); g_signal_connect(window, "delete-event", G_CALLBACK(gtk_main_quit), NULL); - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_grid_new(); + gtk_orientable_set_orientation(GTK_ORIENTABLE(vbox), GTK_ORIENTATION_VERTICAL); + gtk_grid_set_row_spacing(GTK_GRID(vbox), 6); glk = chimara_if_new(); + gtk_widget_set_hexpand(glk, TRUE); + gtk_widget_set_vexpand(glk, TRUE); //g_signal_connect(glk, "command", G_CALLBACK(on_command), window); - hbox = gtk_hbutton_box_new(); + hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); stop = gtk_button_new_with_label("Stop"); g_signal_connect(stop, "clicked", G_CALLBACK(on_stop), glk); go = gtk_button_new_with_label("Go"); @@ -54,8 +56,8 @@ main(int argc, char *argv[]) gtk_box_pack_start(GTK_BOX(hbox), stop, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), go, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), glk, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(vbox), hbox); + gtk_container_add(GTK_CONTAINER(vbox), glk); gtk_container_add(GTK_CONTAINER(window), vbox); gtk_widget_show_all(window);