tConforming dialog buttons for Gun Shop and Player list windows. - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 8ab707530d26358b7c47db6d79bf9d22fcb95170
(DIR) parent d71f49bbf73eb61d86e1974dd6e90c94d0e8636d
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Mon, 25 Mar 2002 16:56:16 +0000
Conforming dialog buttons for Gun Shop and Player list windows.
Diffstat:
M src/gui_client/gtk_client.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
---
(DIR) diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c
t@@ -2508,7 +2508,7 @@ void TransferDialog(gboolean Debt)
void ListPlayers(GtkWidget *widget, gpointer data)
{
- GtkWidget *dialog, *clist, *button, *vbox, *hsep;
+ GtkWidget *dialog, *clist, *button, *vbox, *hsep, *hbbox;
if (IsShowingPlayerList)
return;
t@@ -2539,11 +2539,14 @@ void ListPlayers(GtkWidget *widget, gpointer data)
hsep = gtk_hseparator_new();
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
- button = gtk_button_new_from_stock(GTK_STOCK_OK);
+ hbbox = my_hbbox_new();
+ button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
(gpointer)dialog);
- gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
+
+ gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(dialog), vbox);
gtk_widget_show_all(dialog);
}
t@@ -3012,7 +3015,7 @@ gint DisallowDelete(GtkWidget *widget, GdkEvent *event, gpointer data)
void GunShopDialog(void)
{
- GtkWidget *window, *button, *hsep, *vbox, *hbox;
+ GtkWidget *window, *button, *hsep, *vbox, *hbox, *hbbox;
GtkAccelGroup *accel_group;
gchar *text;
t@@ -3050,13 +3053,14 @@ void GunShopDialog(void)
hsep = gtk_hseparator_new();
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
- button = gtk_button_new_from_stock(GTK_STOCK_OK);
-
+ hbbox = my_hbbox_new();
+ button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
(gpointer)window);
- gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
+ gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
UpdateInventory(&ClientData.Gun, ClientData.Play->Guns, NumGun, FALSE);