X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgrits-test.c;h=cde36cdc533fdb0786450bc881026ba65696f243;hp=10d59ece3491dfbd24c6e2deaa9a7bd2aa09c4f0;hb=5c17e7d79895982036139dcffb5c17cefb1d4d9f;hpb=95561789ea91d7aea0d6dcd7b9321f0d1fc97188 diff --git a/src/grits-test.c b/src/grits-test.c index 10d59ec..cde36cd 100644 --- a/src/grits-test.c +++ b/src/grits-test.c @@ -21,6 +21,8 @@ #include "grits.h" +#include "compat.h" + GritsPrefs *prefs = NULL; GritsPlugins *plugins = NULL; GritsViewer *viewer = NULL; @@ -47,7 +49,7 @@ static gboolean on_delete(GtkWidget *widget, GdkEvent *event, gpointer data) static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer _) { - if (event->keyval == GDK_q) + if (event->keyval == GDK_KEY_q) return grits_shutdown(widget); return FALSE; } @@ -65,16 +67,14 @@ static void load_plugin(GritsPlugins *plugins, gchar *name, ***********/ int main(int argc, char **argv) { - gdk_threads_init(); gtk_init(&argc, &argv); prefs = grits_prefs_new(NULL, NULL); plugins = grits_plugins_new(g_getenv("GRITS_PLUGIN_PATH"), prefs); viewer = grits_opengl_new(plugins, prefs); - gdk_threads_enter(); GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - GtkWidget *vbox = gtk_vbox_new(FALSE, 0); + GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); GtkWidget *config = gtk_notebook_new(); g_signal_connect(window, "delete-event", G_CALLBACK(on_delete), NULL); g_signal_connect(window, "key-press-event", G_CALLBACK(on_key_press), NULL); @@ -98,9 +98,8 @@ int main(int argc, char **argv) gtk_widget_show_all(config); gtk_main(); - gdk_threads_leave(); - gdk_display_close(gdk_display_get_default()); + //gdk_display_close(gdk_display_get_default()); prefs = NULL; plugins = NULL;