Introduction
Introduction Statistics Contact Development Disclaimer Help
tSwitch get/set data from GTK to GLib - vaccinewars - be a doctor and try to va…
git clone git://src.adamsgaard.dk/vaccinewars
Log
Files
Refs
README
LICENSE
---
commit d6e52c734b27b6bf953796f84c88ea334623af04
parent 343c6d2eec86318786bfa09425785bd6affb1a71
Author: Ben Webb <[email protected]>
Date: Fri, 20 Nov 2020 00:07:15 -0800
Switch get/set data from GTK to GLib
Replace e.g. gtk_object_set_data() with
g_object_set_data() to work with GTK+3.
Diffstat:
M src/gui_client/gtk_client.c | 95 +++++++++++++++--------------…
M src/gui_client/newgamedia.c | 16 ++++++++--------
M src/gui_client/optdialog.c | 58 +++++++++++++++---------------
3 files changed, 84 insertions(+), 85 deletions(-)
---
diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c
t@@ -840,7 +840,7 @@ static void FightCallback(GtkWidget *widget, gpointer data)
window = gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW);
if (window) {
- CanRunHere = gtk_object_get_data(GTK_OBJECT(window), "CanRunHere");
+ CanRunHere = g_object_get_data(G_OBJECT(window), "CanRunHere");
}
Answer = GPOINTER_TO_INT(data);
t@@ -936,18 +936,18 @@ static void CreateFightDialog(void)
gtk_table_attach_defaults(GTK_TABLE(table), hsep, 0, 4, 1, 2);
gtk_widget_show_all(table);
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
- gtk_object_set_data(GTK_OBJECT(dialog), "table", table);
+ g_object_set_data(G_OBJECT(dialog), "table", table);
combatants = g_array_new(FALSE, TRUE, sizeof(struct combatant));
g_array_set_size(combatants, 1);
- gtk_object_set_data(GTK_OBJECT(dialog), "combatants", combatants);
+ g_object_set_data(G_OBJECT(dialog), "combatants", combatants);
text = gtk_scrolled_text_view_new(&hbox);
gtk_widget_set_usize(text, 150, 120);
gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
- gtk_object_set_data(GTK_OBJECT(dialog), "text", text);
+ g_object_set_data(G_OBJECT(dialog), "text", text);
gtk_widget_show_all(hbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
t@@ -961,21 +961,21 @@ static void CreateFightDialog(void)
(%Tde = "Drugs" by default) */
buf = dpg_strdup_printf(_("_Deal %Tde"), Names.Drugs);
button = AddFightButton(buf, accel_group, GTK_BOX(hbbox), 'D');
- gtk_object_set_data(GTK_OBJECT(dialog), "deal", button);
+ g_object_set_data(G_OBJECT(dialog), "deal", button);
g_free(buf);
/* Button for shooting at other players in the "Fight" dialog, or for
popping up the "Fight" dialog from the main window */
button = AddFightButton(_("_Fight"), accel_group, GTK_BOX(hbbox), 'F');
- gtk_object_set_data(GTK_OBJECT(dialog), "fight", button);
+ g_object_set_data(G_OBJECT(dialog), "fight", button);
/* Button to stand and take it in the "Fight" dialog */
button = AddFightButton(_("_Stand"), accel_group, GTK_BOX(hbbox), 'S');
- gtk_object_set_data(GTK_OBJECT(dialog), "stand", button);
+ g_object_set_data(G_OBJECT(dialog), "stand", button);
/* Button to run from combat in the "Fight" dialog */
button = AddFightButton(_("_Run"), accel_group, GTK_BOX(hbbox), 'R');
- gtk_object_set_data(GTK_OBJECT(dialog), "run", button);
+ g_object_set_data(G_OBJECT(dialog), "run", button);
gtk_widget_show(hsep);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -1002,9 +1002,9 @@ static void UpdateCombatant(gchar *DefendName, int Defen…
gchar *BitchText, *HealthText;
gfloat ProgPercent;
- combatants = (GArray *)gtk_object_get_data(GTK_OBJECT(FightDialog),
- "combatants");
- table = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(FightDialog), "table"));
+ combatants = (GArray *)g_object_get_data(G_OBJECT(FightDialog),
+ "combatants");
+ table = GTK_WIDGET(g_object_get_data(G_OBJECT(FightDialog), "table"));
if (!combatants) {
return;
}
t@@ -1100,8 +1100,8 @@ static void FreeCombatants(void)
{
GArray *combatants;
- combatants = (GArray *)gtk_object_get_data(GTK_OBJECT(FightDialog),
- "combatants");
+ combatants = (GArray *)g_object_get_data(G_OBJECT(FightDialog),
+ "combatants");
if (combatants) {
g_array_free(combatants, TRUE);
}
t@@ -1158,12 +1158,11 @@ void DisplayFightMessage(char *Data)
return;
}
- Deal = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(FightDialog), "deal"));
- Fight = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(FightDialog), "fight"));
- Stand = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(FightDialog), "stand"));
- Run = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(FightDialog), "run"));
- textview = GTK_TEXT_VIEW(gtk_object_get_data(GTK_OBJECT(FightDialog),
- "text"));
+ Deal = GTK_WIDGET(g_object_get_data(G_OBJECT(FightDialog), "deal"));
+ Fight = GTK_WIDGET(g_object_get_data(G_OBJECT(FightDialog), "fight"));
+ Stand = GTK_WIDGET(g_object_get_data(G_OBJECT(FightDialog), "stand"));
+ Run = GTK_WIDGET(g_object_get_data(G_OBJECT(FightDialog), "run"));
+ textview = GTK_TEXT_VIEW(g_object_get_data(G_OBJECT(FightDialog), "text"));
Play = ClientData.Play;
t@@ -1191,7 +1190,7 @@ void DisplayFightMessage(char *Data)
break;
}
accel_group = (GtkAccelGroup *)
- gtk_object_get_data(GTK_OBJECT(ClientData.window), "accel_group");
+ g_object_get_data(G_OBJECT(ClientData.window), "accel_group");
SetJetButtonTitle(accel_group);
} else {
Message = Data;
t@@ -1203,8 +1202,8 @@ void DisplayFightMessage(char *Data)
CanFire = (Play->Flags & CANSHOOT);
CanRunHere = FALSE;
}
- gtk_object_set_data(GTK_OBJECT(FightDialog), "CanRunHere",
- GINT_TO_POINTER(CanRunHere));
+ g_object_set_data(G_OBJECT(FightDialog), "CanRunHere",
+ GINT_TO_POINTER(CanRunHere));
g_strdelimit(Message, "^", '\n');
if (strlen(Message) > 0) {
t@@ -1292,7 +1291,7 @@ void UpdateStatus(Player *Play)
UpdateInventory(&ClientData.Drug, ClientData.Play->Drugs, NumDrug, TRUE);
gtk_clist_sort(GTK_CLIST(ClientData.Drug.HereList));
accel_group = (GtkAccelGroup *)
- gtk_object_get_data(GTK_OBJECT(ClientData.window), "accel_group");
+ g_object_get_data(G_OBJECT(ClientData.window), "accel_group");
SetJetButtonTitle(accel_group);
if (IsShowingGunShop) {
UpdateInventory(&ClientData.Gun, ClientData.Play->Guns, NumGun, FALSE);
t@@ -1425,7 +1424,7 @@ static void JetCallback(GtkWidget *widget, gpointer data)
gchar *text;
GtkWidget *JetDialog;
- JetDialog = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget), "dialog"));
+ JetDialog = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "dialog"));
NewLocation = GPOINTER_TO_INT(data);
gtk_widget_destroy(JetDialog);
text = g_strdup_printf("%d", NewLocation);
t@@ -1518,7 +1517,7 @@ void Jet(GtkWidget *parent)
g_free(name);
}
gtk_widget_set_sensitive(button, i != ClientData.Play->IsAt);
- gtk_object_set_data(GTK_OBJECT(button), "dialog", dialog);
+ g_object_set_data(G_OBJECT(button), "dialog", dialog);
g_signal_connect(GTK_OBJECT(button), "clicked",
G_CALLBACK(JetCallback), GINT_TO_POINTER(i));
gtk_table_attach_defaults(GTK_TABLE(table), button, col, col + 1, row,
t@@ -1863,8 +1862,8 @@ static void QuestionCallback(GtkWidget *widget, gpointer…
GtkWidget *dialog;
Player *To;
- dialog = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget), "dialog"));
- To = (Player *)gtk_object_get_data(GTK_OBJECT(dialog), "From");
+ dialog = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "dialog"));
+ To = (Player *)g_object_get_data(G_OBJECT(dialog), "From");
Answer = GPOINTER_TO_INT(data);
text[0] = (gchar)Answer;
t@@ -1903,7 +1902,7 @@ void QuestionDialog(char *Data, Player *From)
accel_group = gtk_accel_group_new();
g_signal_connect(GTK_OBJECT(dialog), "delete_event",
G_CALLBACK(DisallowDelete), NULL);
- gtk_object_set_data(GTK_OBJECT(dialog), "From", (gpointer)From);
+ g_object_set_data(G_OBJECT(dialog), "From", (gpointer)From);
/* Title of the 'ask player a question' dialog */
gtk_window_set_title(GTK_WINDOW(dialog), _("Question"));
t@@ -1951,7 +1950,7 @@ void QuestionDialog(char *Data, Player *From)
}
break;
}
- gtk_object_set_data(GTK_OBJECT(button), "dialog", (gpointer)dialog);
+ g_object_set_data(G_OBJECT(button), "dialog", (gpointer)dialog);
g_signal_connect(GTK_OBJECT(button), "clicked",
G_CALLBACK(QuestionCallback),
GINT_TO_POINTER((gint)Responses[i]));
t@@ -2269,7 +2268,7 @@ gboolean GtkLoop(int *argc, char **argv[],
G_CALLBACK(DestroyGtk), NULL);
accel_group = gtk_accel_group_new();
- gtk_object_set_data(GTK_OBJECT(window), "accel_group", accel_group);
+ g_object_set_data(G_OBJECT(window), "accel_group", accel_group);
item_factory = ClientData.Menu = dp_gtk_item_factory_new(GTK_TYPE_MENU_BAR,
"<main>",
accel_group);
t@@ -2519,8 +2518,8 @@ static void TransferOK(GtkWidget *widget, GtkWidget *dia…
price_t money;
gboolean withdraw = FALSE;
- Debt = gtk_object_get_data(GTK_OBJECT(dialog), "debt");
- entry = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(dialog), "entry"));
+ Debt = g_object_get_data(G_OBJECT(dialog), "debt");
+ entry = GTK_WIDGET(g_object_get_data(G_OBJECT(dialog), "entry"));
text = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
money = strtoprice(text);
g_free(text);
t@@ -2536,7 +2535,7 @@ static void TransferOK(GtkWidget *widget, GtkWidget *dia…
/* Title of bank dialog - (%Tde="The Bank" by default) */
title = dpg_strdup_printf(_("%/BankName window title/%Tde"),
Names.BankName);
- deposit = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(dialog), "deposit"));
+ deposit = GTK_WIDGET(g_object_get_data(G_OBJECT(dialog), "deposit"));
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(deposit))) {
withdraw = TRUE;
}
t@@ -2613,7 +2612,7 @@ void TransferDialog(gboolean Debt)
label = gtk_label_new(text->str);
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 3, 1, 2);
- gtk_object_set_data(GTK_OBJECT(dialog), "debt", GINT_TO_POINTER(Debt));
+ g_object_set_data(G_OBJECT(dialog), "debt", GINT_TO_POINTER(Debt));
if (Debt) {
/* Prompt for paying back a loan */
label = gtk_label_new(_("Pay back:"));
t@@ -2621,7 +2620,7 @@ void TransferDialog(gboolean Debt)
} else {
/* Radio button selected if you want to pay money into the bank */
radio = gtk_radio_button_new_with_label(NULL, _("Deposit"));
- gtk_object_set_data(GTK_OBJECT(dialog), "deposit", radio);
+ g_object_set_data(G_OBJECT(dialog), "deposit", radio);
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_table_attach_defaults(GTK_TABLE(table), radio, 0, 1, 2, 3);
t@@ -2632,7 +2631,7 @@ void TransferDialog(gboolean Debt)
label = gtk_label_new(Currency.Symbol);
entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(entry), "0");
- gtk_object_set_data(GTK_OBJECT(dialog), "entry", entry);
+ g_object_set_data(G_OBJECT(dialog), "entry", entry);
g_signal_connect(GTK_OBJECT(entry), "activate",
G_CALLBACK(TransferOK), dialog);
t@@ -2916,9 +2915,9 @@ static void ErrandOK(GtkWidget *widget, GtkWidget *clist)
gint ErrandType;
- dialog = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(widget), "dialog"));
- ErrandType = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(widget),
- "errandtype"));
+ dialog = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "dialog"));
+ ErrandType = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget),
+ "errandtype"));
treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(clist));
if (gtk_tree_selection_get_selected(treesel, &model, &iter)) {
Player *Play;
t@@ -3010,9 +3009,9 @@ void ErrandDialog(gint ErrandType)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_OK, accel_group);
- gtk_object_set_data(GTK_OBJECT(button), "dialog", dialog);
- gtk_object_set_data(GTK_OBJECT(button), "errandtype",
- GINT_TO_POINTER(ErrandType));
+ g_object_set_data(G_OBJECT(button), "dialog", dialog);
+ g_object_set_data(G_OBJECT(button), "errandtype",
+ GINT_TO_POINTER(ErrandType));
g_signal_connect(GTK_OBJECT(button), "clicked",
G_CALLBACK(ErrandOK), (gpointer)clist);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
t@@ -3168,7 +3167,7 @@ static void NewNameOK(GtkWidget *widget, GtkWidget *wind…
GtkWidget *entry;
gchar *text;
- entry = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(window), "entry"));
+ entry = GTK_WIDGET(g_object_get_data(G_OBJECT(window), "entry"));
text = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
if (text[0]) {
StripTerminators(text);
t@@ -3207,7 +3206,7 @@ void NewNameDialog(void)
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
entry = gtk_entry_new();
- gtk_object_set_data(GTK_OBJECT(window), "entry", entry);
+ g_object_set_data(G_OBJECT(window), "entry", entry);
g_signal_connect(GTK_OBJECT(entry), "activate",
G_CALLBACK(NewNameOK), window);
gtk_entry_set_text(GTK_ENTRY(entry), GetPlayerName(ClientData.Play));
t@@ -3310,7 +3309,7 @@ static void CreateSpyReports(void)
SpyReportsDialog = window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
accel_group = gtk_accel_group_new();
- gtk_object_set_data(GTK_OBJECT(window), "accel_group", accel_group);
+ g_object_set_data(G_OBJECT(window), "accel_group", accel_group);
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
/* Title of window to display reports from spies with other players */
t@@ -3326,7 +3325,7 @@ static void CreateSpyReports(void)
vbox = gtk_vbox_new(FALSE, 5);
notebook = gtk_notebook_new();
- gtk_object_set_data(GTK_OBJECT(window), "notebook", notebook);
+ g_object_set_data(G_OBJECT(window), "notebook", notebook);
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
t@@ -3351,9 +3350,9 @@ void DisplaySpyReports(Player *Play)
if (!SpyReportsDialog)
CreateSpyReports();
dialog = SpyReportsDialog;
- notebook = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(dialog), "notebook"));
+ notebook = GTK_WIDGET(g_object_get_data(G_OBJECT(dialog), "notebook"));
accel_group =
- (GtkAccelGroup *)(gtk_object_get_data(GTK_OBJECT(dialog), "accel_group")…
+ (GtkAccelGroup *)(g_object_get_data(G_OBJECT(dialog), "accel_group"));
vbox = gtk_vbox_new(FALSE, 5);
frame = gtk_frame_new("Stats");
gtk_container_set_border_width(GTK_CONTAINER(frame), 3);
diff --git a/src/gui_client/newgamedia.c b/src/gui_client/newgamedia.c
t@@ -665,7 +665,7 @@ void NewGameDialog(Player *play)
#ifdef NETWORKING
static void OKSocksAuth(GtkWidget *widget, GtkWidget *window)
{
- gtk_object_set_data(GTK_OBJECT(window), "authok", GINT_TO_POINTER(TRUE));
+ g_object_set_data(G_OBJECT(window), "authok", GINT_TO_POINTER(TRUE));
gtk_widget_destroy(window);
}
t@@ -676,13 +676,13 @@ static void DestroySocksAuth(GtkWidget *window, gpointer…
gpointer authok;
NetworkBuffer *netbuf;
- authok = gtk_object_get_data(GTK_OBJECT(window), "authok");
+ authok = g_object_get_data(G_OBJECT(window), "authok");
userentry =
- (GtkWidget *)gtk_object_get_data(GTK_OBJECT(window), "username");
+ (GtkWidget *)g_object_get_data(G_OBJECT(window), "username");
passwdentry =
- (GtkWidget *)gtk_object_get_data(GTK_OBJECT(window), "password");
+ (GtkWidget *)g_object_get_data(G_OBJECT(window), "password");
netbuf =
- (NetworkBuffer *)gtk_object_get_data(GTK_OBJECT(window), "netbuf");
+ (NetworkBuffer *)g_object_get_data(G_OBJECT(window), "netbuf");
g_assert(userentry && passwdentry && netbuf);
t@@ -707,7 +707,7 @@ static void SocksAuthDialog(NetworkBuffer *netbuf, gpointe…
g_signal_connect(GTK_OBJECT(window), "destroy",
G_CALLBACK(DestroySocksAuth), NULL);
- gtk_object_set_data(GTK_OBJECT(window), "netbuf", (gpointer)netbuf);
+ g_object_set_data(G_OBJECT(window), "netbuf", (gpointer)netbuf);
/* Title of dialog for authenticating with a SOCKS server */
gtk_window_set_title(GTK_WINDOW(window),
t@@ -729,14 +729,14 @@ static void SocksAuthDialog(NetworkBuffer *netbuf, gpoin…
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
entry = gtk_entry_new();
- gtk_object_set_data(GTK_OBJECT(window), "username", (gpointer)entry);
+ g_object_set_data(G_OBJECT(window), "username", (gpointer)entry);
gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 2, 0, 1);
label = gtk_label_new("Password:");
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
entry = gtk_entry_new();
- gtk_object_set_data(GTK_OBJECT(window), "password", (gpointer)entry);
+ g_object_set_data(G_OBJECT(window), "password", (gpointer)entry);
#ifdef HAVE_FIXED_GTK
/* GTK+ versions earlier than 1.2.10 do bad things with this */
diff --git a/src/gui_client/optdialog.c b/src/gui_client/optdialog.c
t@@ -342,10 +342,10 @@ static void list_delete(GtkWidget *widget, gchar *struct…
GtkCList *clist;
int minlistlength;
- clist = GTK_CLIST(gtk_object_get_data(GTK_OBJECT(widget), "clist"));
+ clist = GTK_CLIST(g_object_get_data(G_OBJECT(widget), "clist"));
g_assert(clist);
- minlistlength = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist),
- "minlistlength"));
+ minlistlength = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(clist),
+ "minlistlength"));
if (clist->rows > minlistlength && clist->selection) {
GSList *listpt;
t@@ -378,7 +378,7 @@ static void list_new(GtkWidget *widget, gchar *structname)
GSList *listpt;
gchar *text[3];
- clist = GTK_CLIST(gtk_object_get_data(GTK_OBJECT(widget), "clist"));
+ clist = GTK_CLIST(g_object_get_data(G_OBJECT(widget), "clist"));
g_assert(clist);
text[0] = g_strdup_printf(_("New %s"), structname);
t@@ -409,7 +409,7 @@ static void list_up(GtkWidget *widget, gchar *structname)
{
GtkCList *clist;
- clist = GTK_CLIST(gtk_object_get_data(GTK_OBJECT(widget), "clist"));
+ clist = GTK_CLIST(g_object_get_data(G_OBJECT(widget), "clist"));
g_assert(clist);
if (clist->selection) {
t@@ -425,7 +425,7 @@ static void list_down(GtkWidget *widget, gchar *structname)
{
GtkCList *clist;
- clist = GTK_CLIST(gtk_object_get_data(GTK_OBJECT(widget), "clist"));
+ clist = GTK_CLIST(g_object_get_data(G_OBJECT(widget), "clist"));
g_assert(clist);
if (clist->selection) {
t@@ -445,11 +445,11 @@ static void list_row_select(GtkCList *clist, gint row, g…
GtkWidget *delbut, *upbut, *downbut;
int minlistlength;
- minlistlength = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist),
- "minlistlength"));
- delbut = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(clist), "delete"));
- upbut = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(clist), "up"));
- downbut = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(clist), "down"));
+ minlistlength = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(clist),
+ "minlistlength"));
+ delbut = GTK_WIDGET(g_object_get_data(G_OBJECT(clist), "delete"));
+ upbut = GTK_WIDGET(g_object_get_data(G_OBJECT(clist), "up"));
+ downbut = GTK_WIDGET(g_object_get_data(G_OBJECT(clist), "down"));
g_assert(delbut && upbut && downbut);
gtk_widget_set_sensitive(delbut, clist->rows > minlistlength);
gtk_widget_set_sensitive(upbut, row > 0);
t@@ -478,9 +478,9 @@ static void list_row_unselect(GtkCList *clist, gint row, g…
GSList *listpt;
GtkWidget *delbut, *upbut, *downbut;
- delbut = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(clist), "delete"));
- upbut = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(clist), "up"));
- downbut = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(clist), "down"));
+ delbut = GTK_WIDGET(g_object_get_data(G_OBJECT(clist), "delete"));
+ upbut = GTK_WIDGET(g_object_get_data(G_OBJECT(clist), "up"));
+ downbut = GTK_WIDGET(g_object_get_data(G_OBJECT(clist), "down"));
g_assert(delbut && upbut && downbut);
gtk_widget_set_sensitive(delbut, FALSE);
gtk_widget_set_sensitive(upbut, FALSE);
t@@ -520,7 +520,7 @@ static void sound_row_select(GtkCList *clist, gint row, gi…
int globind;
gchar **text;
- entry = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(clist), "entry"));
+ entry = GTK_WIDGET(g_object_get_data(G_OBJECT(clist), "entry"));
globind = GPOINTER_TO_INT(gtk_clist_get_row_data(clist, row));
g_assert(globind >=0 && globind < NUMGLOB);
t@@ -535,7 +535,7 @@ static void sound_row_unselect(GtkCList *clist, gint row, …
int globind;
gchar *text, **oldtext;
- entry = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(clist), "entry"));
+ entry = GTK_WIDGET(g_object_get_data(G_OBJECT(clist), "entry"));
globind = GPOINTER_TO_INT(gtk_clist_get_row_data(clist, row));
g_assert(globind >=0 && globind < NUMGLOB);
t@@ -583,8 +583,8 @@ static void OKCallback(GtkWidget *widget, GtkWidget *dialo…
GtkToggleButton *unicode_check;
SaveConfigWidgets();
- unicode_check = GTK_TOGGLE_BUTTON(gtk_object_get_data(GTK_OBJECT(dialog),
- "unicode_check"));
+ unicode_check = GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(dialog),
+ "unicode_check"));
UpdateConfigFile(NULL, gtk_toggle_button_get_active(unicode_check));
gtk_widget_destroy(dialog);
}
t@@ -672,33 +672,33 @@ static GtkWidget *CreateList(gchar *structname, struct C…
hbbox = gtk_hbox_new(TRUE, 5);
button = gtk_button_new_with_label(_("New"));
- gtk_object_set_data(GTK_OBJECT(button), "clist", clist);
+ g_object_set_data(G_OBJECT(button), "clist", clist);
g_signal_connect(GTK_OBJECT(button), "clicked",
G_CALLBACK(list_new), structname);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
button = gtk_button_new_with_label(_("Delete"));
gtk_widget_set_sensitive(button, FALSE);
- gtk_object_set_data(GTK_OBJECT(button), "clist", clist);
- gtk_object_set_data(GTK_OBJECT(clist), "delete", button);
- gtk_object_set_data(GTK_OBJECT(clist), "minlistlength",
- GINT_TO_POINTER(minlistlength));
+ g_object_set_data(G_OBJECT(button), "clist", clist);
+ g_object_set_data(G_OBJECT(clist), "delete", button);
+ g_object_set_data(G_OBJECT(clist), "minlistlength",
+ GINT_TO_POINTER(minlistlength));
g_signal_connect(GTK_OBJECT(button), "clicked",
G_CALLBACK(list_delete), structname);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
button = gtk_button_new_with_label(_("Up"));
gtk_widget_set_sensitive(button, FALSE);
- gtk_object_set_data(GTK_OBJECT(button), "clist", clist);
- gtk_object_set_data(GTK_OBJECT(clist), "up", button);
+ g_object_set_data(G_OBJECT(button), "clist", clist);
+ g_object_set_data(G_OBJECT(clist), "up", button);
g_signal_connect(GTK_OBJECT(button), "clicked",
G_CALLBACK(list_up), structname);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
button = gtk_button_new_with_label(_("Down"));
gtk_widget_set_sensitive(button, FALSE);
- gtk_object_set_data(GTK_OBJECT(button), "clist", clist);
- gtk_object_set_data(GTK_OBJECT(clist), "down", button);
+ g_object_set_data(G_OBJECT(button), "clist", clist);
+ g_object_set_data(G_OBJECT(clist), "down", button);
g_signal_connect(GTK_OBJECT(button), "clicked",
G_CALLBACK(list_down), structname);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
t@@ -805,7 +805,7 @@ void OptDialog(GtkWidget *widget, gpointer data)
check = gtk_check_button_new_with_label(_("Unicode config file"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), IsConfigFileUTF8());
gtk_table_attach_defaults(GTK_TABLE(table), check, 1, 3, 0, 1);
- gtk_object_set_data(GTK_OBJECT(dialog), "unicode_check", check);
+ g_object_set_data(G_OBJECT(dialog), "unicode_check", check);
label = gtk_label_new(_("Game length (turns)"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
t@@ -961,7 +961,7 @@ void OptDialog(GtkWidget *widget, gpointer data)
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
entry = gtk_entry_new();
- gtk_object_set_data(GTK_OBJECT(clist), "entry", entry);
+ g_object_set_data(G_OBJECT(clist), "entry", entry);
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
button = gtk_button_new_with_label(_("Browse..."));
You are viewing proxied material from mx1.adamsgaard.dk. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.