tRemove deprecated gtk_box_pack_start_defaults - vaccinewars - be a doctor and … | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 8e689067b73917bfdbd8720b01839f0280ed5053 | |
parent 407fd240b1d9ecce669deaa14fac7c82c0490799 | |
Author: Ben Webb <[email protected]> | |
Date: Thu, 19 Nov 2020 23:38:28 -0800 | |
Remove deprecated gtk_box_pack_start_defaults | |
gtk_box_pack_start_defaults() has been removed from | |
GTK+3; replace with our own function. | |
Diffstat: | |
M src/gtkport/gtkport.c | 5 ----- | |
M src/gtkport/gtkport.h | 1 - | |
M src/gui_client/gtk_client.c | 44 ++++++++++++++++++++---------… | |
M src/gui_client/gtk_client.h | 1 + | |
M src/gui_client/newgamedia.c | 8 ++++---- | |
M src/gui_client/optdialog.c | 6 +++--- | |
6 files changed, 37 insertions(+), 28 deletions(-) | |
--- | |
diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c | |
t@@ -2157,11 +2157,6 @@ void gtk_box_pack_start(GtkBox *box, GtkWidget *child, … | |
} | |
} | |
-void gtk_box_pack_start_defaults(GtkBox *box, GtkWidget *child) | |
-{ | |
- gtk_box_pack_start(box, child, FALSE, FALSE, 0); | |
-} | |
- | |
void gtk_button_destroy(GtkWidget *widget) | |
{ | |
g_free(GTK_BUTTON(widget)->text); | |
diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h | |
t@@ -538,7 +538,6 @@ void gtk_table_set_row_spacings(GtkTable *table, guint spa… | |
void gtk_table_set_col_spacings(GtkTable *table, guint spacing); | |
void gtk_box_pack_start(GtkBox *box, GtkWidget *child, gboolean Expand, | |
gboolean Fill, gint Padding); | |
-void gtk_box_pack_start_defaults(GtkBox *box, GtkWidget *child); | |
void gtk_toggle_button_toggled(GtkToggleButton *toggle_button); | |
gboolean gtk_toggle_button_get_active(GtkToggleButton *toggle_button); | |
void gtk_toggle_button_set_active(GtkToggleButton *toggle_button, | |
diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c | |
t@@ -216,6 +216,20 @@ GtkWidget *my_hbbox_new(void) | |
} | |
/* | |
+ * Do the equivalent of gtk_box_pack_start_defaults(). | |
+ * This has been removed from GTK+3. | |
+ */ | |
+void my_gtk_box_pack_start_defaults(GtkBox *box, GtkWidget *child) | |
+{ | |
+#ifdef CYGWIN | |
+ /* For compatibility with older dopewars */ | |
+ gtk_box_pack_start(box, child, FALSE, FALSE, 0); | |
+#else | |
+ gtk_box_pack_start(box, child, TRUE, TRUE, 0); | |
+#endif | |
+} | |
+ | |
+/* | |
* Sets the initial size and window manager hints of a dialog. | |
*/ | |
void my_set_dialog_position(GtkWindow *dialog) | |
t@@ -344,7 +358,7 @@ void ListInventory(GtkWidget *widget, gpointer data) | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
GTK_OBJECT(window)); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_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); | |
t@@ -785,7 +799,7 @@ void CompleteHighScoreDialog(gboolean AtEnd) | |
gtk_signal_connect_object(GTK_OBJECT(dialog), "destroy", | |
GTK_SIGNAL_FUNC(EndHighScore), NULL); | |
} | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(HiScoreDialog.vbox), hbbox, FALSE, FALSE, 0); | |
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); | |
t@@ -1755,13 +1769,13 @@ void DealDrugs(GtkWidget *widget, gpointer data) | |
GTK_SIGNAL_FUNC(DealOKCallback), data); | |
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); | |
defbutton = button; | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
GTK_OBJECT(dialog)); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_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); | |
t@@ -1941,7 +1955,7 @@ void QuestionDialog(char *Data, Player *From) | |
gtk_signal_connect(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(QuestionCallback), | |
GINT_TO_POINTER((gint)Responses[i])); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
} | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, TRUE, TRUE, 0); | |
gtk_container_add(GTK_CONTAINER(dialog), vbox); | |
t@@ -2471,7 +2485,7 @@ void display_intro(GtkWidget *widget, gpointer data) | |
gtk_signal_connect_object(GTK_OBJECT(OKButton), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
GTK_OBJECT(dialog)); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), OKButton); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), OKButton); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
gtk_container_add(GTK_CONTAINER(dialog), vbox); | |
t@@ -2639,20 +2653,20 @@ void TransferDialog(gboolean Debt) | |
button = NewStockButton(GTK_STOCK_OK, accel_group); | |
gtk_signal_connect(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(TransferOK), dialog); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
if (Debt && ClientData.Play->Cash >= ClientData.Play->Debt) { | |
/* Button to pay back the entire loan/debt */ | |
button = gtk_button_new_with_label(_("Pay all")); | |
gtk_signal_connect(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(TransferPayAll), dialog); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
} | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
GTK_OBJECT(dialog)); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_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); | |
t@@ -2699,7 +2713,7 @@ void ListPlayers(GtkWidget *widget, gpointer data) | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
GTK_OBJECT(dialog)); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_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); | |
t@@ -2833,13 +2847,13 @@ void TalkDialog(gboolean TalkToAll) | |
gtk_signal_connect(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(TalkSend), (gpointer)&TalkData); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
button = NewStockButton(GTK_STOCK_CLOSE, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
GTK_OBJECT(dialog)); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |
t@@ -3001,12 +3015,12 @@ void ErrandDialog(gint ErrandType) | |
GINT_TO_POINTER(ErrandType)); | |
gtk_signal_connect(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(ErrandOK), (gpointer)clist); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
GTK_OBJECT(dialog)); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_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); | |
t@@ -3260,7 +3274,7 @@ void GunShopDialog(void) | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
GTK_OBJECT(window)); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_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); | |
diff --git a/src/gui_client/gtk_client.h b/src/gui_client/gtk_client.h | |
t@@ -43,6 +43,7 @@ gboolean GtkLoop(int *argc, char **argv[], | |
void GuiStartGame(void); | |
GtkWidget *my_hbbox_new(void); | |
+void my_gtk_box_pack_start_defaults(GtkBox *box, GtkWidget *child); | |
void my_set_dialog_position(GtkWindow *dialog); | |
#endif | |
diff --git a/src/gui_client/newgamedia.c b/src/gui_client/newgamedia.c | |
t@@ -618,7 +618,7 @@ void NewGameDialog(Player *play) | |
button = NewStockButton(GTK_STOCK_REFRESH, accel_group); | |
gtk_signal_connect(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(UpdateMetaServerList), NULL); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
button = gtk_button_new_with_label(""); | |
SetAccelerator(button, _("_Connect"), button, "clicked", accel_group, TRUE); | |
t@@ -627,7 +627,7 @@ void NewGameDialog(Player *play) | |
gtk_widget_set_sensitive(button, FALSE); | |
treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(clist)); | |
g_signal_connect(treesel, "changed", G_CALLBACK(metalist_changed), button); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox2), hbbox, FALSE, FALSE, 0); | |
gtk_container_add(GTK_CONTAINER(frame), vbox2); | |
t@@ -755,13 +755,13 @@ static void SocksAuthDialog(NetworkBuffer *netbuf, gpoin… | |
button = NewStockButton(GTK_STOCK_OK, accel_group); | |
gtk_signal_connect(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(OKSocksAuth), (gpointer)window); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(gtk_widget_destroy), | |
GTK_OBJECT(window)); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_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@@ -991,12 +991,12 @@ void OptDialog(GtkWidget *widget, gpointer data) | |
button = NewStockButton(GTK_STOCK_OK, accel_group); | |
gtk_signal_connect(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(OKCallback), (gpointer)dialog); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
button = NewStockButton(GTK_STOCK_HELP, accel_group); | |
gtk_signal_connect(GTK_OBJECT(button), "clicked", | |
GTK_SIGNAL_FUNC(HelpCallback), (gpointer)notebook); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", | |
t@@ -1004,7 +1004,7 @@ void OptDialog(GtkWidget *widget, gpointer data) | |
GTK_OBJECT(dialog)); | |
gtk_signal_connect(GTK_OBJECT(dialog), "destroy", | |
GTK_SIGNAL_FUNC(FinishOptDialog), NULL); | |
- gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
+ my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); | |