Remove site from GisViewer

[grits] / src / gis_test.c

diff --git a/src/gis_test.c b/src/gis_test.c
index 054373e494cdaee0b14e19cca8b11277b5ac6f60..7a68afa5e144bfb9d4b6a10ec808bf4a48172686 100644 (file)
--- 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,33 +41,32 @@ 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);
-       GisWorld   *world   = gis_world_new();
-       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);
+       GisViewer  *viewer  = gis_opengl_new(plugins);
 
+       gdk_threads_enter();
        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_container_add(GTK_CONTAINER(window), GTK_WIDGET(viewer));
        gtk_widget_show_all(window);
+       gdk_threads_leave();
+
+       gis_plugins_load(plugins, "bmng", viewer, prefs);
+       //gis_plugins_load(plugins, "srtm", viewer, prefs);
+       gis_plugins_load(plugins, "test", viewer, prefs);
 
-       gis_view_set_site(view, "KLSX");
+       gdk_threads_enter();
        gtk_main();
 
        g_object_unref(prefs);
-       g_object_unref(world);
-       g_object_unref(view);
-       g_object_unref(opengl);
+       g_object_unref(viewer);
        gis_plugins_free(plugins);
+       gdk_threads_leave();
        return 0;
 }