Author: cazfi
Date: Mon Jan  2 20:08:10 2017
New Revision: 34774

URL: http://svn.gna.org/viewcvs/freeciv?rev=34774&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:
    trunk/client/gui-gtk-3.22/editgui.c
    trunk/client/gui-gtk-3.22/gui_main.c
    trunk/client/gui-gtk-3.22/voteinfo_bar.c

Modified: trunk/client/gui-gtk-3.22/editgui.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/editgui.c?rev=34774&r1=34773&r2=34774&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.22/editgui.c (original)
+++ trunk/client/gui-gtk-3.22/editgui.c Mon Jan  2 20:08:10 2017
@@ -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: trunk/client/gui-gtk-3.22/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/gui_main.c?rev=34774&r1=34773&r2=34774&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.22/gui_main.c        (original)
+++ trunk/client/gui-gtk-3.22/gui_main.c        Mon Jan  2 20:08:10 2017
@@ -1619,7 +1619,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: trunk/client/gui-gtk-3.22/voteinfo_bar.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/voteinfo_bar.c?rev=34774&r1=34773&r2=34774&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.22/voteinfo_bar.c    (original)
+++ trunk/client/gui-gtk-3.22/voteinfo_bar.c    Mon Jan  2 20:08:10 2017
@@ -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

Reply via email to