tBugs with using grab_default fixed; stock GTK+ widgets now used extensively. - 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 05f195053eb196bbd2bb98fbe04bb3a6ee1a1d3c
(DIR) parent 64b99d4dfee7b87fb0018d5525dbf16d4fe6cde7
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Mon, 25 Mar 2002 16:53:51 +0000
Bugs with using grab_default fixed; stock GTK+ widgets now used extensively.
Diffstat:
M src/gui_client/gtk_client.c | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
---
(DIR) diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c
t@@ -283,8 +283,7 @@ void ListInventory(GtkWidget *widget, gpointer data)
hsep = gtk_hseparator_new();
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
- /* Caption of the button to close a dialog */
- button = gtk_button_new_with_label(_("Close"));
+ 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);
t@@ -699,8 +698,7 @@ void CompleteHighScoreDialog(gboolean AtEnd)
if (!HiScoreDialog.dialog)
return;
- /* Caption of the "OK" button in dialogs */
- OKButton = gtk_button_new_with_label(_("OK"));
+ OKButton = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_signal_connect_object(GTK_OBJECT(OKButton), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
(gpointer)dialog);
t@@ -1511,7 +1509,7 @@ static void DealOKCallback(GtkWidget *widget, gpointer data)
void DealDrugs(GtkWidget *widget, gpointer data)
{
GtkWidget *dialog, *label, *hbox, *hbbox, *button, *spinner, *menu,
- *optionmenu, *menuitem, *vbox, *hsep;
+ *optionmenu, *menuitem, *vbox, *hsep, *defbutton;
GtkAdjustment *spin_adj;
GtkAccelGroup *accel_group;
GtkWidget *clist;
t@@ -1649,15 +1647,14 @@ void DealDrugs(GtkWidget *widget, gpointer data)
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
hbbox = gtk_hbutton_box_new();
- button = gtk_button_new_with_label(_("OK"));
+ button = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(DealOKCallback), data);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default(button);
+ defbutton = button;
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
- /* Caption of "Cancel" button for GTK+ client dialogs */
- button = gtk_button_new_with_label(_("Cancel"));
+ button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
(gpointer)dialog);
t@@ -1670,6 +1667,7 @@ void DealDrugs(GtkWidget *widget, gpointer data)
UpdateDealDialog();
gtk_widget_show_all(dialog);
+ gtk_widget_grab_default(defbutton);
}
void DealGuns(GtkWidget *widget, gpointer data)
t@@ -2276,7 +2274,7 @@ void display_intro(GtkWidget *widget, gpointer data)
hsep = gtk_hseparator_new();
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
- OKButton = gtk_button_new_with_label(_("OK"));
+ OKButton = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_signal_connect_object(GTK_OBJECT(OKButton), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
(gpointer)dialog);
t@@ -2438,7 +2436,7 @@ void TransferDialog(gboolean Debt)
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
hbbox = gtk_hbutton_box_new();
- button = gtk_button_new_with_label(_("OK"));
+ button = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(TransferOK), dialog);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
t@@ -2497,7 +2495,7 @@ 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_with_label(_("OK"));
+ button = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
(gpointer)dialog);
t@@ -2624,7 +2622,7 @@ void TalkDialog(gboolean TalkToAll)
GTK_SIGNAL_FUNC(TalkSend), (gpointer)&TalkData);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
- button = gtk_button_new_with_label(_("Close"));
+ 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);
t@@ -2764,7 +2762,7 @@ void ErrandDialog(gint ErrandType)
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
hbbox = gtk_hbutton_box_new();
- button = gtk_button_new_with_label(_("OK"));
+ button = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_object_set_data(GTK_OBJECT(button), "dialog", dialog);
gtk_object_set_data(GTK_OBJECT(button), "errandtype",
GINT_TO_POINTER(ErrandType));
t@@ -2951,7 +2949,7 @@ void NewNameDialog(void)
hsep = gtk_hseparator_new();
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
- button = gtk_button_new_with_label(_("OK"));
+ button = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(NewNameOK), window);
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
t@@ -3065,7 +3063,7 @@ static void CreateSpyReports(void)
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
- button = gtk_button_new_with_label(_("Close"));
+ 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);