tjh.dev
1---
2 Makefile | 6 +++---
3 menu.c | 11 ++++++++---
4 middle.c | 9 +++++++--
5 xbindkeys_config.c | 3 ++-
6 4 files changed, 20 insertions(+), 9 deletions(-)
7
8diff --git a/Makefile b/Makefile
9index 602875c..28e46cd 100644
10--- a/Makefile
11+++ b/Makefile
12@@ -1,9 +1,9 @@
13 # makefile cr�e par Laurent VUIBERT
14
15-CC= gcc -O3 -Wall
16+CC= gcc $(CFLAGS)
17 STD= _GNU_SOURCE
18-GTK= `gtk-config --cflags --libs`
19-GTK2= `gtk-config --cflags`
20+GTK= `pkg-config --cflags --libs gtk+-2.0`
21+GTK2= `pkg-config --cflags gtk+-2.0`
22 OBJS= xbindkeys_config.o menu.o middle.o speedc.o
23 NOM= xbindkeys_config
24
25diff --git a/menu.c b/menu.c
26index ed3e7ec..f11526d 100644
27--- a/menu.c
28+++ b/menu.c
29@@ -283,6 +283,8 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data)
30 GtkWidget *window;
31 GtkWidget *text;
32 GtkWidget *vbox;
33+ GtkTextBuffer *textbuffer;
34+ GtkTextIter iter;
35
36 window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
37 gtk_window_set_title(GTK_WINDOW(window),
38@@ -293,10 +295,13 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data)
39 text = gtk_label_new("\nManual\n");
40 gtk_box_pack_start(GTK_BOX(vbox), text, FALSE, FALSE, 0);
41
42- text = gtk_text_new(NULL,NULL);
43+/* BDD - FIXME */
44+/* text = gtk_text_new(NULL,NULL); */
45+ text = gtk_text_view_new();
46+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
47+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0);
48
49-
50- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL,
51+ gtk_text_buffer_insert (textbuffer, &iter,
52 MANUAL_TEXT, sizeof(MANUAL_TEXT)-1);
53 gtk_box_pack_start(GTK_BOX(vbox), text, TRUE, TRUE, 0);
54 gtk_widget_set_usize(text,300,250);
55diff --git a/middle.c b/middle.c
56index daa61aa..605ab10 100644
57--- a/middle.c
58+++ b/middle.c
59@@ -551,6 +551,8 @@ void view_generated_file()
60 GtkWidget *window;
61 GtkWidget *text;
62 GtkWidget *src;
63+ GtkTextBuffer *textbuffer;
64+ GtkTextIter iter;
65 char line [1024];
66
67 unlink(TEMP_FILE);
68@@ -561,11 +563,13 @@ void view_generated_file()
69 gtk_window_set_title(GTK_WINDOW(window), "Generated File");
70 src = gtk_scrolled_window_new ( NULL, NULL );
71 gtk_widget_set_usize(src,500,400);
72- text = gtk_text_new (NULL, NULL);
73+ text = gtk_text_view_new ();
74+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
75+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0);
76 gtk_container_add (GTK_CONTAINER(src), text);
77
78 while (fgets (line, sizeof(line), f))
79- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL,
80+ gtk_text_buffer_insert (textbuffer, &iter,
81 line, strlen(line));
82
83 gtk_container_add(GTK_CONTAINER(window),src);
84@@ -610,6 +614,7 @@ void save_file(char file_out[])
85 fprintf(f, "# m:xxx + c:xxx \n");
86 fprintf(f, "# Shift+... \n\n\n\n\n");
87
88+
89 if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Flag_NumLock)))
90 fprintf(f,"keystate_numlock = enable\n");
91 else
92diff --git a/xbindkeys_config.c b/xbindkeys_config.c
93index 75bad30..3c02a2b 100644
94--- a/xbindkeys_config.c
95+++ b/xbindkeys_config.c
96@@ -95,7 +95,8 @@ int main (int argc, char *argv[])
97 accel_group = gtk_accel_group_new();
98 menu=xbindkeys_config_menu(accel_group);
99 gtk_box_pack_start(GTK_BOX(vbox),menu,FALSE,FALSE,0);
100- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
101+/* BDD - FIXME - Don't need this? */
102+/* gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); */
103
104 middle= xbindkeys_config_middle();
105 gtk_box_pack_start(GTK_BOX(vbox),middle,TRUE,TRUE,0);
106--
1072.1.3
108