Gtk 3 Port

[grits] / src / tile-test.c

diff --git a/src/tile-test.c b/src/tile-test.c
index aeb01ff7dd939415911edaebc7300add854c2523..ad512bb4d8bd9173cd628189110443e2ceef1d9b 100644 (file)
--- a/src/tile-test.c
+++ b/src/tile-test.c
@@ -63,9 +63,9 @@ gpointer do_bmng_cache(gpointer _image)
 
        g_message("Loading bmng image: [%s]", path);
        GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
-       gdk_threads_enter();
+       //gdk_threads_enter();
        gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
-       gdk_threads_leave();
+       //gdk_threads_leave();
 
        g_message("Cleaning bmng up");
        grits_wms_free(bmng_wms);
@@ -89,9 +89,9 @@ gpointer do_osm_cache(gpointer _image)
 
        g_message("Loading osm image: [%s]", path);
        GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
-       gdk_threads_enter();
+       //gdk_threads_enter();
        gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
-       gdk_threads_leave();
+       //gdk_threads_leave();
 
        g_message("Cleaning osm up");
        grits_wms_free(osm_wms);
@@ -114,9 +114,9 @@ gpointer do_osm2_cache(gpointer _image)
 
        g_message("Loading osm2 image: [%s]", path);
        GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
-       gdk_threads_enter();
+       //gdk_threads_enter();
        gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
-       gdk_threads_leave();
+       //gdk_threads_leave();
 
        g_message("Cleaning osm2 up");
        grits_tms_free(osm2_tms);
@@ -127,19 +127,18 @@ gpointer do_osm2_cache(gpointer _image)
 
 gboolean key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
-       if (event->keyval == GDK_q)
+       if (event->keyval == GDK_KEY_q)
                gtk_main_quit();
        return TRUE;
 }
 
 int main(int argc, char **argv)
 {
-       gdk_threads_init();
        gtk_init(&argc, &argv);
 
        GtkWidget *win        = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       GtkWidget *vbox1      = gtk_vbox_new(FALSE, 0);
-       GtkWidget *vbox2      = gtk_vbox_new(FALSE, 0);
+       GtkWidget *vbox1      = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+       GtkWidget *vbox2      = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        GtkWidget *status     = gtk_statusbar_new();
        GtkWidget *scroll     = gtk_scrolled_window_new(NULL, NULL);
        GtkWidget *bmng_image = gtk_image_new();