diff -Nur -Xpatches/no.freeciv freeciv/client/gui-gtk/citydlg.c my_freeciv/client/gui-gtk/citydlg.c --- freeciv/client/gui-gtk/citydlg.c Sat Oct 7 14:23:34 2000 +++ my_freeciv/client/gui-gtk/citydlg.c Thu Jan 4 15:34:17 2001 @@ -59,7 +59,7 @@ extern GdkGC *civ_gc; #define NUM_UNITS_SHOWN 12 -#define NUM_CITIZENS_SHOWN 25 +#define NUM_CITIZENS_SHOWN 35 struct city_dialog { @@ -75,11 +75,8 @@ GtkWidget *pollution_label; GtkWidget *sub_form; GtkWidget *map_canvas; - GtkWidget *sell_command; - GtkWidget *close_command, *rename_command, *trade_command, *activate_command; - GtkWidget *show_units_command, *cityopt_command; - GtkWidget *building_label, *progress_label, *buy_command, *change_command, - *worklist_command, *worklist_label; + GtkWidget *building_label, *progress_label, *buy_command, *change_command; + GtkWidget *sell_command, *worklist_command, *worklist_label; GtkWidget *improvement_viewport, *improvement_list; GtkWidget *support_unit_label; GtkWidget *support_unit_boxes [NUM_UNITS_SHOWN]; @@ -89,9 +86,12 @@ GtkWidget *present_unit_boxes [NUM_UNITS_SHOWN]; GtkWidget *present_unit_pixmaps [NUM_UNITS_SHOWN]; GtkWidget *present_unit_button [2]; + GtkWidget *close_command, *rename_command, *trade_command; + GtkWidget *activate_command, *show_units_command, *cityopt_command; + GtkWidget *change_shell, *change_list; - GtkWidget *rename_input; GtkWidget *worklist_shell; + GtkWidget *rename_input; Impr_Type_id sell_id; @@ -102,81 +102,118 @@ int present_unit_pos; char improvlist_names[B_LAST+1][64]; char *improvlist_names_ptrs[B_LAST+1]; - int change_list_ids[B_LAST+1+U_LAST+1]; int change_list_num_improvements; int is_modal; -}; +}; /* end struct city_dialog */ + +static GdkBitmap *icon_bitmap; static struct genlist dialog_list; static int dialog_list_has_been_initialised; -struct city_dialog *get_city_dialog(struct city *pcity); -struct city_dialog *create_city_dialog(struct city *pcity, int make_modal); -void close_city_dialog(struct city_dialog *pdialog); - -void city_dialog_update_improvement_list(struct city_dialog *pdialog); -void city_dialog_update_title(struct city_dialog *pdialog); -void city_dialog_update_supported_units(struct city_dialog *pdialog, int id); -void city_dialog_update_present_units(struct city_dialog *pdialog, int id); -void city_dialog_update_citizens(struct city_dialog *pdialog); -void city_dialog_update_map(struct city_dialog *pdialog); -void city_dialog_update_food(struct city_dialog *pdialog); -void city_dialog_update_production(struct city_dialog *pdialog); -void city_dialog_update_output(struct city_dialog *pdialog); -void city_dialog_update_building(struct city_dialog *pdialog); -void city_dialog_update_storage(struct city_dialog *pdialog); -void city_dialog_update_pollution(struct city_dialog *pdialog); - -void sell_callback (GtkWidget *w, gpointer data); -void buy_callback (GtkWidget *w, gpointer data); -void change_callback (GtkWidget *w, gpointer data); -void worklist_callback (GtkWidget *w, gpointer data); -void commit_city_worklist(struct worklist *pwl, void *data); -void cancel_city_worklist(void *data); -void close_callback (GtkWidget *w, gpointer data); -void rename_callback (GtkWidget *w, gpointer data); -void trade_callback (GtkWidget *w, gpointer data); -void activate_callback (GtkWidget *w, gpointer data); -void show_units_callback(GtkWidget *w, gpointer data); -void unitupgrade_callback_yes (GtkWidget *w, gpointer data); -void unitupgrade_callback_no (GtkWidget *w, gpointer data); -void upgrade_callback (GtkWidget *w, gpointer data); - -gint elvis_callback (GtkWidget *w, GdkEventButton *ev, gpointer data); -gint scientist_callback (GtkWidget *w, GdkEventButton *ev, gpointer data); -gint taxman_callback (GtkWidget *w, GdkEventButton *ev, gpointer data); -void rename_ok_return_action(GtkWidget *w); - -gint present_units_callback(GtkWidget *w, GdkEventButton *ev, gpointer data); -gint p_units_middle_callback(GtkWidget *w, GdkEventButton *ev, gpointer data); -gint s_units_middle_callback(GtkWidget *w, GdkEventButton *ev, gpointer data); -void cityopt_callback(GtkWidget *w, gpointer data); -void popdown_cityopt_dialog(void); +static struct city_dialog *get_city_dialog(struct city *pcity); +static struct city_dialog *create_city_dialog(struct city *pcity, + int make_modal); +static void close_city_dialog(struct city_dialog *pdialog); + +static void city_dialog_update_title(struct city_dialog *pdialog); +static void city_dialog_update_citizens(struct city_dialog *pdialog); +static void city_dialog_update_map(struct city_dialog *pdialog); +static void city_dialog_update_food(struct city_dialog *pdialog); +static void city_dialog_update_production(struct city_dialog *pdialog); +static void city_dialog_update_output(struct city_dialog *pdialog); +static void city_dialog_update_storage(struct city_dialog *pdialog); +static void city_dialog_update_pollution(struct city_dialog *pdialog); +static void city_dialog_update_building(struct city_dialog *pdialog); +static void city_dialog_update_improvement_list(struct city_dialog *pdialog); +static void city_dialog_update_supported_units(struct city_dialog *pdialog, + int id); +static void city_dialog_update_present_units(struct city_dialog *pdialog, + int id); -GdkBitmap *icon_bitmap; +static gint city_map_canvas_expose(GtkWidget *w, GdkEventExpose *ev, + gpointer data); +static gint city_dialog_delete_callback(GtkWidget *w, GdkEvent *ev, + gpointer data); +static void city_dialog_support_unit_pos_callback(GtkWidget *w, gpointer data); +static void city_dialog_present_unit_pos_callback(GtkWidget *w, gpointer data); + +static void buy_callback (GtkWidget *w, gpointer data); +static void change_callback (GtkWidget *w, gpointer data); +static void sell_callback (GtkWidget *w, gpointer data); +static void worklist_callback (GtkWidget *w, gpointer data); +static void close_callback (GtkWidget *w, gpointer data); +static void rename_callback (GtkWidget *w, gpointer data); +static void trade_callback (GtkWidget *w, gpointer data); +static void activate_callback (GtkWidget *w, gpointer data); +static void show_units_callback (GtkWidget *w, gpointer data); +static void cityopt_callback (GtkWidget *w, gpointer data); + +/* specialist toggle */ +static gint elvis_callback (GtkWidget *w, GdkEventButton *ev, + gpointer data); +static gint scientist_callback (GtkWidget *w, GdkEventButton *ev, + gpointer data); +static gint taxman_callback (GtkWidget *w, GdkEventButton *ev, + gpointer data); + +/* worklist stuff */ +static void buy_callback_yes(GtkWidget *w, gpointer data); +static void buy_callback_no(GtkWidget *w, gpointer data); +static void change_to_callback(GtkWidget *w, gpointer data); +static void change_no_callback(GtkWidget *w, gpointer data); +static void change_help_callback(GtkWidget *w, gpointer data); +static gint change_deleted_callback(GtkWidget *w, GdkEvent *ev, gpointer data); +static void change_list_callback(GtkWidget *w, gint row, gint col, GdkEvent *ev, + gpointer data); +static void sell_callback_yes(GtkWidget *w, gpointer data); +static void sell_callback_no(GtkWidget *w, gpointer data); +static void commit_city_worklist(struct worklist *pwl, void *data); +static void cancel_city_worklist(void *data); + +/* units */ +static gint present_units_callback(GtkWidget *w, GdkEventButton *ev, + gpointer data); +static gint p_units_middle_callback(GtkWidget *w, GdkEventButton *ev, + gpointer data); +static gint s_units_middle_callback(GtkWidget *w, GdkEventButton *ev, + gpointer data); +static void activate_unit(struct unit *punit); +static void unitupgrade_callback_yes (GtkWidget *w, gpointer data); +static void unitupgrade_callback_no (GtkWidget *w, gpointer data); +static void upgrade_callback (GtkWidget *w, gpointer data); +static void present_units_activate_callback(GtkWidget *w, gpointer data); +static void present_units_activate_close_callback(GtkWidget *w, gpointer data); +static void present_units_sentry_callback(GtkWidget *w, gpointer data); +static void present_units_fortify_callback(GtkWidget *w, gpointer data); +static void present_units_disband_callback(GtkWidget *w, gpointer data); +static void present_units_homecity_callback(GtkWidget *w, gpointer data); +static void present_units_cancel_callback(GtkWidget *w, gpointer data); +static void supported_units_activate_close_callback(GtkWidget *w, gpointer data); +static gint support_units_callback(GtkWidget *w, GdkEventButton *ev, + gpointer data); +/* rename */ +static void rename_ok_return_action(GtkWidget *w); +static void rename_city_callback(GtkWidget *w, gpointer data); -/**************************************************************** -... -*****************************************************************/ -struct city_dialog *get_city_dialog(struct city *pcity) -{ - struct genlist_iterator myiter; +/* trade */ +static void trade_message_dialog_callback(GtkWidget *w, gpointer data); - if(!dialog_list_has_been_initialised) { - genlist_init(&dialog_list); - dialog_list_has_been_initialised=1; - } - - genlist_iterator_init(&myiter, &dialog_list, 0); - - for(; ITERATOR_PTR(myiter); ITERATOR_NEXT(myiter)) - if(((struct city_dialog *)ITERATOR_PTR(myiter))->pcity==pcity) - return ITERATOR_PTR(myiter); - - return 0; -} +/* city options */ +#define NUM_CITYOPT_TOGGLES 5 +static GtkWidget *create_cityopt_dialog(char *city_name); +static void cityopt_ok_command_callback(GtkWidget *w, gpointer data); +static void cityopt_cancel_command_callback(GtkWidget *w, gpointer data); +static void cityopt_newcit_radio_callback(GtkWidget *w, gpointer data); +static void popdown_cityopt_dialog(void); +static char *ncitizen_labels[] = { N_("Elvises"), N_("Scientists"), N_("Taxmen") }; +static GtkWidget *cityopt_shell = 0; +static GtkWidget *cityopt_radio[3]; /* cityopt_ncitizen_radio */ +static GtkWidget *cityopt_toggles[NUM_CITYOPT_TOGGLES]; +static int cityopt_city_id = 0; +static int ncitizen_idx; /**************************************************************** ... @@ -343,7 +380,29 @@ /**************************************************************** ... *****************************************************************/ -struct city_dialog *create_city_dialog(struct city *pcity, int make_modal) +static struct city_dialog *get_city_dialog(struct city *pcity) +{ + struct genlist_iterator myiter; + + if(!dialog_list_has_been_initialised) { + genlist_init(&dialog_list); + dialog_list_has_been_initialised=1; + } + + genlist_iterator_init(&myiter, &dialog_list, 0); + + for(; ITERATOR_PTR(myiter); ITERATOR_NEXT(myiter)) + if(((struct city_dialog *)ITERATOR_PTR(myiter))->pcity==pcity) + return ITERATOR_PTR(myiter); + + return 0; +} + +/**************************************************************** +... +*****************************************************************/ +static struct city_dialog *create_city_dialog(struct city *pcity, + int make_modal) { int i; struct city_dialog *pdialog; @@ -686,7 +745,37 @@ /**************************************************************** ... *****************************************************************/ -void activate_callback(GtkWidget *w, gpointer data) +static void close_city_dialog(struct city_dialog *pdialog) +{ + gtk_widget_hide(pdialog->shell); + genlist_unlink(&dialog_list, pdialog); + + if(pdialog->is_modal) + gtk_widget_set_sensitive(toplevel, TRUE); + + if (pdialog->worklist_shell) + gtk_widget_destroy(pdialog->worklist_shell); + + if (pdialog->change_shell) + gtk_widget_destroy(pdialog->change_shell); + + unit_list_iterate(pdialog->pcity->info_units_supported, psunit) { + free(psunit); + } unit_list_iterate_end; + unit_list_unlink_all(&(pdialog->pcity->info_units_supported)); + unit_list_iterate(pdialog->pcity->info_units_present, psunit) { + free(psunit); + } unit_list_iterate_end; + unit_list_unlink_all(&(pdialog->pcity->info_units_present)); + + gtk_widget_destroy(pdialog->shell); + free(pdialog); +} + +/**************************************************************** +... +*****************************************************************/ +static void activate_callback(GtkWidget *w, gpointer data) { struct city_dialog *pdialog = (struct city_dialog *)data; int x=pdialog->pcity->x,y=pdialog->pcity->y; @@ -708,7 +797,7 @@ /**************************************************************** ... *****************************************************************/ -void show_units_callback(GtkWidget *w, gpointer data) +static void show_units_callback(GtkWidget *w, gpointer data) { struct city_dialog *pdialog = (struct city_dialog *)data; struct tile *ptile = map_get_tile(pdialog->pcity->x, pdialog->pcity->y); @@ -849,7 +938,8 @@ /**************************************************************** ... *****************************************************************/ -gint p_units_middle_callback(GtkWidget *w, GdkEventButton *ev, gpointer data) +static gint p_units_middle_callback(GtkWidget *w, GdkEventButton *ev, + gpointer data) { struct unit *punit; struct city *pcity; @@ -869,7 +959,8 @@ /**************************************************************** ... *****************************************************************/ -gint s_units_middle_callback(GtkWidget *w, GdkEventButton *ev, gpointer data) +static gint s_units_middle_callback(GtkWidget *w, GdkEventButton *ev, + gpointer data) { struct unit *punit; struct city *pcity; @@ -889,7 +980,8 @@ /**************************************************************** Pop-up menu to change attributes of units, ex. change homecity. *****************************************************************/ -gint present_units_callback(GtkWidget *w, GdkEventButton *ev, gpointer data) +static gint present_units_callback(GtkWidget *w, GdkEventButton *ev, + gpointer data) { struct unit *punit; struct city *pcity; @@ -962,7 +1054,7 @@ /**************************************************************** ... *****************************************************************/ -void rename_callback(GtkWidget *w, gpointer data) +static void rename_callback(GtkWidget *w, gpointer data) { struct city_dialog *pdialog; @@ -987,7 +1079,7 @@ /**************************************************************** ... *****************************************************************/ -void trade_callback(GtkWidget *w, gpointer data) +static void trade_callback(GtkWidget *w, gpointer data) { int i; int x=0,total=0; @@ -1036,7 +1128,7 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_pollution(struct city_dialog *pdialog) +static void city_dialog_update_pollution(struct city_dialog *pdialog) { char buf[512]; struct city *pcity=pdialog->pcity; @@ -1063,7 +1155,7 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_storage(struct city_dialog *pdialog) +static void city_dialog_update_storage(struct city_dialog *pdialog) { char buf[512]; struct city *pcity=pdialog->pcity; @@ -1077,7 +1169,7 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_building(struct city_dialog *pdialog) +static void city_dialog_update_building(struct city_dialog *pdialog) { char buf[32], buf2[64]; int turns; @@ -1137,7 +1229,7 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_production(struct city_dialog *pdialog) +static void city_dialog_update_production(struct city_dialog *pdialog) { char buf[512]; struct city *pcity=pdialog->pcity; @@ -1150,10 +1242,11 @@ gtk_set_label(pdialog->production_label, buf); } + /**************************************************************** ... *****************************************************************/ -void city_dialog_update_output(struct city_dialog *pdialog) +static void city_dialog_update_output(struct city_dialog *pdialog) { char buf[512]; struct city *pcity=pdialog->pcity; @@ -1171,7 +1264,7 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_map(struct city_dialog *pdialog) +static void city_dialog_update_map(struct city_dialog *pdialog) { int x, y; struct city *pcity=pdialog->pcity; @@ -1203,7 +1296,7 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_citizens(struct city_dialog *pdialog) +static void city_dialog_update_citizens(struct city_dialog *pdialog) { int i, n; struct city *pcity=pdialog->pcity; @@ -1331,8 +1424,8 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_supported_units(struct city_dialog *pdialog, - int unitid) +static void city_dialog_update_supported_units(struct city_dialog *pdialog, + int unitid) { int i; struct unit_list *plist; @@ -1404,7 +1497,8 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_present_units(struct city_dialog *pdialog, int unitid) +static void city_dialog_update_present_units(struct city_dialog *pdialog, + int unitid) { int i; struct unit_list *plist; @@ -1475,7 +1569,7 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_title(struct city_dialog *pdialog) +static void city_dialog_update_title(struct city_dialog *pdialog) { char buf[512]; char *now; @@ -1493,7 +1587,7 @@ /**************************************************************** ... *****************************************************************/ -void city_dialog_update_improvement_list(struct city_dialog *pdialog) +static void city_dialog_update_improvement_list(struct city_dialog *pdialog) { int i, n, flag; @@ -1564,7 +1658,7 @@ /**************************************************************** ... *****************************************************************/ -gint elvis_callback(GtkWidget *w, GdkEventButton *ev, gpointer data) +static gint elvis_callback(GtkWidget *w, GdkEventButton *ev, gpointer data) { struct city_dialog *pdialog; struct packet_city_request packet; @@ -1585,7 +1679,7 @@ /**************************************************************** ... *****************************************************************/ -gint scientist_callback(GtkWidget *w, GdkEventButton *ev, gpointer data) +static gint scientist_callback(GtkWidget *w, GdkEventButton *ev, gpointer data) { struct city_dialog *pdialog; struct packet_city_request packet; @@ -1606,7 +1700,7 @@ /**************************************************************** ... *****************************************************************/ -gint taxman_callback(GtkWidget *w, GdkEventButton *ev, gpointer data) +static gint taxman_callback(GtkWidget *w, GdkEventButton *ev, gpointer data) { struct city_dialog *pdialog; struct packet_city_request packet; @@ -1655,7 +1749,7 @@ /**************************************************************** ... *****************************************************************/ -void buy_callback(GtkWidget *w, gpointer data) +static void buy_callback(GtkWidget *w, gpointer data) { struct city_dialog *pdialog; int value; @@ -1695,7 +1789,7 @@ /**************************************************************** ... *****************************************************************/ -void unitupgrade_callback_yes(GtkWidget *w, gpointer data) +static void unitupgrade_callback_yes(GtkWidget *w, gpointer data) { struct unit *punit; @@ -1709,7 +1803,7 @@ /**************************************************************** ... *****************************************************************/ -void unitupgrade_callback_no(GtkWidget *w, gpointer data) +static void unitupgrade_callback_no(GtkWidget *w, gpointer data) { destroy_message_dialog(w); } @@ -1718,7 +1812,7 @@ /**************************************************************** ... *****************************************************************/ -void upgrade_callback(GtkWidget *w, gpointer data) +static void upgrade_callback(GtkWidget *w, gpointer data) { struct unit *punit; char buf[512]; @@ -1858,7 +1952,8 @@ /**************************************************************** ... *****************************************************************/ -static void change_list_callback(GtkWidget *w, gint row, gint col, GdkEvent *ev, gpointer data) +static void change_list_callback(GtkWidget *w, gint row, gint col, GdkEvent *ev, + gpointer data) /* Allows new production options to be selected via a double-click */ { if(ev && ev->type==GDK_2BUTTON_PRESS) @@ -1868,7 +1963,7 @@ /**************************************************************** ... *****************************************************************/ -void change_callback(GtkWidget *w, gpointer data) +static void change_callback(GtkWidget *w, gpointer data) { GtkWidget *cshell, *button, *scrolled; struct city_dialog *pdialog; @@ -2023,7 +2118,7 @@ /**************************************************************** Display the city's worklist. *****************************************************************/ -void worklist_callback(GtkWidget *w, gpointer data) +static void worklist_callback(GtkWidget *w, gpointer data) { struct city_dialog *pdialog; @@ -2044,7 +2139,7 @@ /**************************************************************** Commit the changes to the worklist for the city. *****************************************************************/ -void commit_city_worklist(struct worklist *pwl, void *data) +static void commit_city_worklist(struct worklist *pwl, void *data) { struct packet_city_request packet; struct city_dialog *pdialog = (struct city_dialog *)data; @@ -2100,7 +2195,11 @@ pdialog->worklist_shell = NULL; } -void cancel_city_worklist(void *data) { +/**************************************************************** +... +*****************************************************************/ +static void cancel_city_worklist(void *data) +{ struct city_dialog *pdialog = (struct city_dialog *)data; pdialog->worklist_shell = NULL; } @@ -2137,7 +2236,7 @@ /**************************************************************** ... *****************************************************************/ -void sell_callback(GtkWidget *w, gpointer data) +static void sell_callback(GtkWidget *w, gpointer data) { struct city_dialog *pdialog; GList *selection; @@ -2173,37 +2272,7 @@ /**************************************************************** ... *****************************************************************/ -void close_city_dialog(struct city_dialog *pdialog) -{ - gtk_widget_hide(pdialog->shell); - genlist_unlink(&dialog_list, pdialog); - - if(pdialog->is_modal) - gtk_widget_set_sensitive(toplevel, TRUE); - - if (pdialog->worklist_shell) - gtk_widget_destroy(pdialog->worklist_shell); - - if (pdialog->change_shell) - gtk_widget_destroy(pdialog->change_shell); - - unit_list_iterate(pdialog->pcity->info_units_supported, psunit) { - free(psunit); - } unit_list_iterate_end; - unit_list_unlink_all(&(pdialog->pcity->info_units_supported)); - unit_list_iterate(pdialog->pcity->info_units_present, psunit) { - free(psunit); - } unit_list_iterate_end; - unit_list_unlink_all(&(pdialog->pcity->info_units_present)); - - gtk_widget_destroy(pdialog->shell); - free(pdialog); -} - -/**************************************************************** -... -*****************************************************************/ -void close_callback(GtkWidget *w, gpointer data) +static void close_callback(GtkWidget *w, gpointer data) { close_city_dialog((struct city_dialog *)data); } @@ -2218,26 +2287,7 @@ multiple city dialogs. *****************************************************************/ - -#define NUM_CITYOPT_TOGGLES 5 - -GtkWidget *create_cityopt_dialog(char *city_name); -void cityopt_ok_command_callback(GtkWidget *w, gpointer data); -void cityopt_cancel_command_callback(GtkWidget *w, gpointer data); -void cityopt_newcit_radio_callback(GtkWidget *w, gpointer data); - -char *ncitizen_labels[] = { N_("Elvises"), N_("Scientists"), N_("Taxmen") }; - -static GtkWidget *cityopt_shell = 0; -static GtkWidget *cityopt_radio[3]; /* cityopt_ncitizen_radio */ -static GtkWidget *cityopt_toggles[NUM_CITYOPT_TOGGLES]; -static int cityopt_city_id = 0; -static int ncitizen_idx; - -/**************************************************************** -... -*****************************************************************/ -void cityopt_callback(GtkWidget *w, gpointer data) +static void cityopt_callback(GtkWidget *w, gpointer data) { struct city_dialog *pdialog = (struct city_dialog *)data; struct city *pcity = pdialog->pcity; @@ -2269,11 +2319,10 @@ gtk_widget_show(cityopt_shell); } - /************************************************************************** ... **************************************************************************/ -GtkWidget *create_cityopt_dialog(char *city_name) +static GtkWidget *create_cityopt_dialog(char *city_name) { GtkWidget *shell, *label, *frame, *vbox, *ok, *cancel; GtkAccelGroup *accel=gtk_accel_group_new(); @@ -2364,7 +2413,7 @@ /************************************************************************** ... **************************************************************************/ -void cityopt_cancel_command_callback(GtkWidget *w, gpointer data) +static void cityopt_cancel_command_callback(GtkWidget *w, gpointer data) { gtk_widget_destroy(cityopt_shell); cityopt_shell = 0; @@ -2373,7 +2422,7 @@ /************************************************************************** ... **************************************************************************/ -void cityopt_ok_command_callback(GtkWidget *w, gpointer data) +static void cityopt_ok_command_callback(GtkWidget *w, gpointer data) { struct city *pcity = find_city_by_id(cityopt_city_id); @@ -2402,7 +2451,7 @@ /************************************************************************** Sets newcitizen_index based on the selected radio button. **************************************************************************/ -void cityopt_newcit_radio_callback(GtkWidget *w, gpointer data) +static void cityopt_newcit_radio_callback(GtkWidget *w, gpointer data) { ncitizen_idx = GPOINTER_TO_INT(data); } @@ -2410,7 +2459,7 @@ /************************************************************************** ... **************************************************************************/ -void popdown_cityopt_dialog(void) +static void popdown_cityopt_dialog(void) { if(cityopt_shell) { gtk_widget_destroy(cityopt_shell);