Author: cazfi
Date: Sat Nov 12 07:08:57 2016
New Revision: 34488
URL: http://svn.gna.org/viewcvs/freeciv?rev=34488&view=rev
Log:
Use gtk_widget_set_focus_on_click() instead of deprecated
gtk_button_set_focus_on_click()
in gtk3.22-client.
See patch #7222
Modified:
branches/S2_6/client/gui-gtk-3.22/editgui.c
branches/S2_6/client/gui-gtk-3.22/gui_main.c
branches/S2_6/client/gui-gtk-3.22/voteinfo_bar.c
Modified: branches/S2_6/client/gui-gtk-3.22/editgui.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/editgui.c?rev=34488&r1=34487&r2=34488&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.22/editgui.c (original)
+++ branches/S2_6/client/gui-gtk-3.22/editgui.c Sat Nov 12 07:08:57 2016
@@ -441,7 +441,7 @@
gtk_widget_set_tooltip_text(button, editor_tool_get_tooltip(ett));
gtk_size_group_add_widget(eb->size_group, button);
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
- gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+ gtk_widget_set_focus_on_click(button, FALSE);
g_signal_connect(button, "toggled",
G_CALLBACK(editbar_tool_button_toggled), GINT_TO_POINTER(ett));
@@ -503,7 +503,7 @@
}
gtk_size_group_add_widget(eb->size_group, button);
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
- gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+ gtk_widget_set_focus_on_click(button, FALSE);
g_signal_connect(button, "toggled",
G_CALLBACK(editbar_mode_button_toggled), GINT_TO_POINTER(etm));
@@ -597,9 +597,9 @@
gtk_widget_set_tooltip_text(button, _("Show the property editor."));
gtk_size_group_add_widget(eb->size_group, button);
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
- gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+ gtk_widget_set_focus_on_click(button, FALSE);
g_signal_connect(button, "clicked",
- G_CALLBACK(editbar_player_properties_button_clicked), eb);
+ G_CALLBACK(editbar_player_properties_button_clicked), eb);
gtk_container_add(GTK_CONTAINER(hbox), button);
eb->player_properties_button = button;
Modified: branches/S2_6/client/gui-gtk-3.22/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/gui_main.c?rev=34488&r1=34487&r2=34488&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.22/gui_main.c (original)
+++ branches/S2_6/client/gui-gtk-3.22/gui_main.c Sat Nov 12 07:08:57 2016
@@ -1627,7 +1627,7 @@
g_object_set(view, "margin", 3, NULL);
button = gtk_check_button_new_with_label(_("Allies Only"));
- gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+ gtk_widget_set_focus_on_click(button, FALSE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
GUI_GTK_OPTION(allied_chat_only));
g_signal_connect(button, "toggled",
Modified: branches/S2_6/client/gui-gtk-3.22/voteinfo_bar.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/voteinfo_bar.c?rev=34488&r1=34487&r2=34488&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.22/voteinfo_bar.c (original)
+++ branches/S2_6/client/gui-gtk-3.22/voteinfo_bar.c Sat Nov 12 07:08:57 2016
@@ -149,7 +149,7 @@
gtk_button_set_image(GTK_BUTTON(button), arrow);
gtk_widget_set_size_request(button, -1, BUTTON_HEIGHT);
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
- gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+ gtk_widget_set_focus_on_click(button, FALSE);
gtk_container_add(GTK_CONTAINER(hbox), button);
vib->next_button = button;
@@ -157,7 +157,7 @@
g_signal_connect(button, "clicked",
G_CALLBACK(voteinfo_bar_do_vote_callback),
GINT_TO_POINTER(CVT_YES));
- gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+ gtk_widget_set_focus_on_click(button, FALSE);
gtk_container_add(GTK_CONTAINER(hbox), button);
gtk_widget_set_name(button, "vote yes button");
vib->yes_button = button;
@@ -172,7 +172,7 @@
g_signal_connect(button, "clicked",
G_CALLBACK(voteinfo_bar_do_vote_callback),
GINT_TO_POINTER(CVT_NO));
- gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+ gtk_widget_set_focus_on_click(button, FALSE);
gtk_container_add(GTK_CONTAINER(hbox), button);
gtk_widget_set_name(button, "vote no button");
vib->no_button = button;
@@ -187,7 +187,7 @@
g_signal_connect(button, "clicked",
G_CALLBACK(voteinfo_bar_do_vote_callback),
GINT_TO_POINTER(CVT_ABSTAIN));
- gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+ gtk_widget_set_focus_on_click(button, FALSE);
gtk_container_add(GTK_CONTAINER(hbox), button);
gtk_widget_set_name(button, "vote abstain button");
vib->abstain_button = button;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
