Mercurial > geeqie
comparison src/bar_gps.c @ 1679:1867687f2fcb
libchamplain compatibility fix
author | nadvornik |
---|---|
date | Sun, 28 Jun 2009 11:55:54 +0000 |
parents | 0806ccdfe06b |
children | fc147a2d8aaf |
comparison
equal
deleted
inserted
replaced
1678:1e3bbaa772b9 | 1679:1867687f2fcb |
---|---|
691 pgd->height = height; | 691 pgd->height = height; |
692 | 692 |
693 scrolled = gtk_scrolled_window_new(NULL, NULL); | 693 scrolled = gtk_scrolled_window_new(NULL, NULL); |
694 vbox = gtk_vbox_new(FALSE, 0); | 694 vbox = gtk_vbox_new(FALSE, 0); |
695 | 695 |
696 #ifdef GTK_CHAMPLAIN_EMBED | |
696 gpswidget = gtk_champlain_embed_new (); | 697 gpswidget = gtk_champlain_embed_new (); |
697 view = gtk_champlain_embed_get_view (GTK_CHAMPLAIN_EMBED (gpswidget)); | 698 view = gtk_champlain_embed_get_view (GTK_CHAMPLAIN_EMBED (gpswidget)); |
698 | 699 #else |
700 view = champlain_view_new(); | |
701 gpswidget = champlain_view_embed_new(CHAMPLAIN_VIEW(view)); | |
702 #endif | |
699 viewport = gtk_viewport_new(NULL, NULL); | 703 viewport = gtk_viewport_new(NULL, NULL); |
700 | 704 |
701 gtk_container_add(GTK_CONTAINER(viewport), gpswidget); | 705 gtk_container_add(GTK_CONTAINER(viewport), gpswidget); |
702 gtk_box_pack_start(GTK_BOX(vbox),viewport, TRUE, TRUE, 0); | 706 gtk_box_pack_start(GTK_BOX(vbox),viewport, TRUE, TRUE, 0); |
703 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), vbox); | 707 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), vbox); |