Skip to content

Commit 240f177

Browse files
committed
update:gui:gtk somehow shows up, but frequent segfaults
1 parent dce54b3 commit 240f177

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

navit/gui/gtk/destination.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ int destination_address(struct navit *nav) {
545545
gtk_widget_grab_focus(search->entry_city);
546546

547547
gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
548-
keyboard=gtk_socket_new();
548+
// keyboard=gtk_socket_new();
549549
gtk_box_pack_end(GTK_BOX(vbox), keyboard, FALSE, FALSE, 0);
550550
gtk_container_add(GTK_CONTAINER(window2), vbox);
551551
#if 0
@@ -554,7 +554,7 @@ int destination_address(struct navit *nav) {
554554
gtk_widget_show_all(window2);
555555

556556
#ifndef _WIN32
557-
gtk_socket_steal(GTK_SOCKET(keyboard), spawn_xkbd("xkbd","-geometry 200x100"));
557+
// gtk_socket_steal(GTK_SOCKET(keyboard), spawn_xkbd("xkbd","-geometry 200x100"));
558558
#endif
559559

560560
country_attr=country_default();

navit/gui/gtk/gui_gtk_poi.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <stdlib.h>
2121
#include <gtk/gtk.h>
22+
#include <gtk/gtkx.h>
2223
#include "gui_gtk_poi.h"
2324
#include "popup.h"
2425
#include "debug.h"
@@ -384,7 +385,9 @@ void gtk_gui_poi(struct navit *nav) {
384385
search->label_distance = gtk_label_new(_("Select a search radius from screen center in miles"));
385386
}
386387

387-
search->entry_distance=gtk_entry_new_with_max_length(2);
388+
//search->entry_distance=gtk_entry_new_with_max_length(2);
389+
search->entry_distance=gtk_entry_new();
390+
gtk_entry_set_max_length(GTK_ENTRY(search->entry_distance),2);
388391
gtk_entry_set_text(GTK_ENTRY(search->entry_distance),"10");
389392

390393
search->treeview_cat=gtk_tree_view_new();

navit/gui/gtk/gui_gtk_window.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <X11/XF86keysym.h>
2828
#endif
2929
#include <gtk/gtk.h>
30+
#include <gtk/gtkx.h>
3031
#include "config.h"
3132
#include "item.h"
3233
#include "xmlconfig.h"

0 commit comments

Comments
 (0)