Commit 6b60248271858d8e241c44501bc93a891166304a
1 parent
b70a94cb
Exists in
master
and in
1 other branch
Removing warnings.
Showing
3 changed files
with
10 additions
and
2 deletions
Show diff stats
src/testprogram/testprogram.c
... | ... | @@ -173,6 +173,8 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { |
173 | 173 | GtkWidget *grid = gtk_grid_new(); |
174 | 174 | GtkWidget *color = v3270_color_scheme_new(); |
175 | 175 | |
176 | + gtk_widget_set_can_focus(color,FALSE); | |
177 | + gtk_widget_set_focus_on_click(color,FALSE); | |
176 | 178 | v3270_color_scheme_set_rgba(color,v3270_get_color_table(terminal)); |
177 | 179 | g_signal_connect(G_OBJECT(color),"update-colors",G_CALLBACK(color_scheme_changed),terminal); |
178 | 180 | |
... | ... | @@ -186,6 +188,7 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { |
186 | 188 | gtk_window_set_default_size (GTK_WINDOW (window), 800, 500); |
187 | 189 | gtk_container_add(GTK_CONTAINER(window),box); |
188 | 190 | gtk_widget_show_all (window); |
191 | + gtk_widget_grab_focus(terminal); | |
189 | 192 | |
190 | 193 | // v3270_set_toggle(terminal,LIB3270_TOGGLE_RECONNECT,1); |
191 | 194 | ... | ... |
src/v3270/print.c
... | ... | @@ -27,6 +27,8 @@ |
27 | 27 | * |
28 | 28 | */ |
29 | 29 | |
30 | + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | |
31 | + | |
30 | 32 | #include "private.h" |
31 | 33 | #include <v3270.h> |
32 | 34 | #include <v3270/colorscheme.h> |
... | ... | @@ -340,7 +342,8 @@ |
340 | 342 | g_signal_emit(info->widget, v3270_widget_signal[SIGNAL_PRINT_BEGIN], 0, prt); |
341 | 343 | |
342 | 344 | |
343 | - widget = v3270_color_scheme_new(info->color); | |
345 | + widget = v3270_color_scheme_new(); | |
346 | + v3270_color_scheme_set_rgba(widget,info->color); | |
344 | 347 | gtk_label_set_mnemonic_widget(GTK_LABEL(label[1]),widget); |
345 | 348 | |
346 | 349 | g_object_set_data(G_OBJECT(container),"combo",widget); |
... | ... | @@ -465,7 +468,7 @@ |
465 | 468 | gchar * text; |
466 | 469 | GError * err = NULL; |
467 | 470 | |
468 | - g_return_val_if_fail(GTK_IS_V3270(widget),EINVAL); | |
471 | + g_return_if_fail(GTK_IS_V3270(widget)); | |
469 | 472 | |
470 | 473 | print = begin_print_operation(widget,&info); |
471 | 474 | if(!print) | ... | ... |