X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgis_test.c;h=35f2901546d44ae225ff32bce86996004b8f1f6e;hp=054373e494cdaee0b14e19cca8b11277b5ac6f60;hb=f510823bdc5b77fa0c5336ad608f13f251a0ada5;hpb=ac7156bd84aef88b712f117f7e2f3d847d371719 diff --git a/src/gis_test.c b/src/gis_test.c index 054373e..35f2901 100644 --- a/src/gis_test.c +++ b/src/gis_test.c @@ -26,7 +26,7 @@ *************/ static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer _) { - g_debug("gis: on_key_press - key=%x, state=%x", + g_debug("GisTest: on_key_press - key=%x, state=%x", event->keyval, event->state); switch (event->keyval) { case GDK_q: @@ -41,8 +41,9 @@ static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer _) ***********/ int main(int argc, char **argv) { - gtk_init(&argc, &argv); g_thread_init(NULL); + gdk_threads_init(); + gtk_init(&argc, &argv); GisPrefs *prefs = gis_prefs_new(NULL, NULL); GisPlugins *plugins = gis_plugins_new(NULL); @@ -50,18 +51,16 @@ int main(int argc, char **argv) GisView *view = gis_view_new(); GisOpenGL *opengl = gis_opengl_new(world, view, plugins); - //gis_plugins_load(plugins, "radar", world, view, opengl, prefs); - //gis_plugins_load(plugins, "ridge", world, view, opengl, prefs); - gis_plugins_load(plugins, "bmng", world, view, opengl, prefs); - gis_plugins_load(plugins, "srtm", world, view, opengl, prefs); - GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL); g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); g_signal_connect(window, "key-press-event", G_CALLBACK(on_key_press), NULL); gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(opengl)); gtk_widget_show_all(window); + gis_plugins_load(plugins, "bmng", world, view, opengl, prefs); + //gis_plugins_load(plugins, "srtm", world, view, opengl, prefs); gis_view_set_site(view, "KLSX"); + gtk_main(); g_object_unref(prefs);