tCast the last argument of gtk_signal_connect_object to (GtkObject *), like we'… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit b6b6239567de41d5831bf703ea6d0821bad727c4 | |
parent 75d60ef016adbd45bf5c03e5919a01c133fafcf2 | |
Author: Ben Webb <[email protected]> | |
Date: Wed, 10 Jul 2002 19:44:45 +0000 | |
Cast the last argument of gtk_signal_connect_object to (GtkObject *), like | |
we're supposed to do. | |
Diffstat: | |
M src/gui_client/gtk_client.c | 20 ++++++++++---------- | |
M src/gui_client/newgamedia.c | 4 ++-- | |
M src/gui_client/optdialog.c | 6 +++--- | |
3 files changed, 15 insertions(+), 15 deletions(-) | |
--- | |
diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c | |
t@@ -309,7 +309,7 @@ void ListInventory(GtkWidget *widget, gpointer data) | |
button = NewStockButton(GTK_STOCK_CLOSE, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)window); | |
+ GTK_OBJECT(window)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
t@@ -745,7 +745,7 @@ void CompleteHighScoreDialog(gboolean AtEnd) | |
button = NewStockButton(GTK_STOCK_CLOSE, HiScoreDialog.accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)dialog); | |
+ GTK_OBJECT(dialog)); | |
if (AtEnd) { | |
InGame = FALSE; | |
gtk_signal_connect_object(GTK_OBJECT(dialog), "destroy", | |
t@@ -1705,7 +1705,7 @@ void DealDrugs(GtkWidget *widget, gpointer data) | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)dialog); | |
+ GTK_OBJECT(dialog)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
t@@ -2439,7 +2439,7 @@ void display_intro(GtkWidget *widget, gpointer data) | |
OKButton = NewStockButton(GTK_STOCK_OK, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(OKButton), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)dialog); | |
+ GTK_OBJECT(dialog)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), OKButton); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
t@@ -2618,7 +2618,7 @@ void TransferDialog(gboolean Debt) | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)dialog); | |
+ GTK_OBJECT(dialog)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
t@@ -2664,7 +2664,7 @@ void ListPlayers(GtkWidget *widget, gpointer data) | |
button = NewStockButton(GTK_STOCK_CLOSE, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)dialog); | |
+ GTK_OBJECT(dialog)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
t@@ -2791,7 +2791,7 @@ void TalkDialog(gboolean TalkToAll) | |
button = NewStockButton(GTK_STOCK_CLOSE, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)dialog); | |
+ GTK_OBJECT(dialog)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
t@@ -2942,7 +2942,7 @@ void ErrandDialog(gint ErrandType) | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)dialog); | |
+ GTK_OBJECT(dialog)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
t@@ -3187,7 +3187,7 @@ void GunShopDialog(void) | |
button = NewStockButton(GTK_STOCK_CLOSE, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)window); | |
+ GTK_OBJECT(window)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
t@@ -3244,7 +3244,7 @@ static void CreateSpyReports(void) | |
button = NewStockButton(GTK_STOCK_CLOSE, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)window); | |
+ GTK_OBJECT(window)); | |
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); | |
gtk_container_add(GTK_CONTAINER(window), vbox); | |
diff --git a/src/gui_client/newgamedia.c b/src/gui_client/newgamedia.c | |
t@@ -743,7 +743,7 @@ void AuthDialog(HttpConnection *conn, gboolean proxy, gcha… | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)window); | |
+ GTK_OBJECT(window)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, TRUE, TRUE, 0); | |
t@@ -851,7 +851,7 @@ static void RealSocksAuthDialog(NetworkBuffer *netbuf, gbo… | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)window); | |
+ GTK_OBJECT(window)); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, TRUE, TRUE, 0); | |
diff --git a/src/gui_client/optdialog.c b/src/gui_client/optdialog.c | |
t@@ -924,12 +924,12 @@ void OptDialog(GtkWidget *widget, gpointer data) | |
button = gtk_button_new_with_label(_("Browse...")); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
- GTK_SIGNAL_FUNC(BrowseSound), entry); | |
+ GTK_SIGNAL_FUNC(BrowseSound), GTK_OBJECT(entry)); | |
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); | |
button = gtk_button_new_with_label(_("Play")); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
- GTK_SIGNAL_FUNC(TestPlaySound), entry); | |
+ GTK_SIGNAL_FUNC(TestPlaySound), GTK_OBJECT(entry)); | |
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); | |
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); | |
t@@ -953,7 +953,7 @@ void OptDialog(GtkWidget *widget, gpointer data) | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
- (gpointer)dialog); | |
+ GTK_OBJECT(dialog)); | |
gtk_signal_connect(GTK_OBJECT(dialog), "destroy", | |
GTK_SIGNAL_FUNC(FinishOptDialog), NULL); | |
gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); |