diff -u client/gui-gtk/citydlg.c /home/vasc/freeciv/client/gui-gtk/citydlg.c --- client/gui-gtk/citydlg.c Thu Feb 10 14:42:49 2000 +++ /home/vasc/freeciv/client/gui-gtk/citydlg.c Wed Feb 9 15:38:08 2000 @@ -58,8 +57,6 @@ extern GdkGC *fill_bg_gc; extern GdkGC *civ_gc; -extern GtkStyle *city_dialog_style; - #define NUM_UNITS_SHOWN 12 #define NUM_CITIZENS_SHOWN 25 @@ -370,25 +367,25 @@ pdialog->production_label=gtk_label_new("\n\n"); gtk_box_pack_start(GTK_BOX(box),pdialog->production_label, TRUE, TRUE, 0); - gtk_widget_set_style (pdialog->production_label, city_dialog_style); + gtk_widget_set_name (pdialog->production_label, "city label"); gtk_label_set_justify (GTK_LABEL (pdialog->production_label), GTK_JUSTIFY_LEFT); pdialog->output_label=gtk_label_new("\n\n"); gtk_box_pack_start(GTK_BOX(box),pdialog->output_label, TRUE, TRUE, 0); - gtk_widget_set_style (pdialog->output_label, city_dialog_style); + gtk_widget_set_name (pdialog->output_label, "city label"); gtk_label_set_justify (GTK_LABEL (pdialog->output_label), GTK_JUSTIFY_LEFT); pdialog->storage_label=gtk_label_new(""); gtk_box_pack_start(GTK_BOX(box),pdialog->storage_label, TRUE, TRUE, 0); - gtk_widget_set_style (pdialog->storage_label, city_dialog_style); + gtk_widget_set_name (pdialog->storage_label, "city label"); gtk_label_set_justify (GTK_LABEL (pdialog->storage_label), GTK_JUSTIFY_LEFT); pdialog->pollution_label=gtk_label_new(""); gtk_box_pack_start(GTK_BOX(box),pdialog->pollution_label, TRUE, TRUE, 0); - gtk_widget_set_style (pdialog->pollution_label, city_dialog_style); + gtk_widget_set_name (pdialog->pollution_label, "city label"); gtk_label_set_justify (GTK_LABEL (pdialog->pollution_label), GTK_JUSTIFY_LEFT); diff -u client/gui-gtk/dialogs.c /home/vasc/freeciv/client/gui-gtk/dialogs.c --- client/gui-gtk/dialogs.c Sat Feb 5 12:45:10 2000 +++ /home/vasc/freeciv/client/gui-gtk/dialogs.c Wed Feb 9 15:33:50 2000 @@ -130,8 +130,6 @@ static GtkWidget *caravan_dialog; -extern GtkStyle *notify_dialog_style; - static int is_showing_unit_connect_dialog = FALSE; static int unit_to_use_to_connect; static int connect_unit_x; @@ -176,8 +174,8 @@ notify_headline = gtk_label_new( headline); gtk_box_pack_start( GTK_BOX( GTK_DIALOG(notify_dialog_shell)->vbox ), notify_headline, FALSE, FALSE, 0 ); + gtk_widget_set_name (notify_headline, "notify label"); - gtk_widget_set_style( notify_headline, notify_dialog_style ); gtk_label_set_justify( GTK_LABEL( notify_headline ), GTK_JUSTIFY_LEFT ); gtk_misc_set_alignment(GTK_MISC(notify_headline), 0.0, 0.0); @@ -188,7 +186,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW (notify_scrolled), notify_label); - gtk_widget_set_style( notify_label, notify_dialog_style ); + gtk_widget_set_name (notify_label, "notify label"); gtk_label_set_justify( GTK_LABEL( notify_label ), GTK_JUSTIFY_LEFT ); gtk_misc_set_alignment(GTK_MISC(notify_label), 0.0, 0.0); diff -u client/gui-gtk/gui_main.c /home/vasc/freeciv/client/gui-gtk/gui_main.c --- client/gui-gtk/gui_main.c Fri Jan 28 14:38:37 2000 +++ /home/vasc/freeciv/client/gui-gtk/gui_main.c Wed Feb 9 15:46:45 2000 @@ -59,9 +59,6 @@ #include "freeciv.ico" -#define NOTIFY_DIALOG_FONT "-b&h-lucidatypewriter-bold-r-normal-*-12-*-*-*-*-*-*-*" -#define FIXED_10_BFONT "-b&h-lucidatypewriter-bold-r-normal-*-10-*-*-*-*-*-*-*" - /*void file_quit_cmd_callback( GtkWidget *widget, gpointer data )*/ void game_rates( GtkWidget *widget, gpointer data ); @@ -133,9 +136,6 @@ GtkWidget * map_horizontal_scrollbar, *map_vertical_scrollbar; gint gdk_input_id; -GtkStyle * notify_dialog_style; -GtkStyle * city_dialog_style; - GdkWindow * root_window; @@ -534,12 +588,18 @@ { GdkBitmap *icon_bitmap; parse_options(argc, argv); /* GTK withdraw gtk options */ /* Process GTK arguments */ gtk_init(&argc, &argv); + gtk_rc_parse ("freeciv.rc"); + display_color_type=get_visual(); toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -547,16 +607,6 @@ root_window=toplevel->window; init_color_system(); - - notify_dialog_style=gtk_style_new(); - gdk_font_unref (notify_dialog_style->font); - notify_dialog_style->font=gdk_font_load (NOTIFY_DIALOG_FONT); - gdk_font_ref (notify_dialog_style->font); - - city_dialog_style=gtk_style_new(); - gdk_font_unref (city_dialog_style->font); - city_dialog_style->font=gdk_font_load (FIXED_10_BFONT); - gdk_font_ref (city_dialog_style->font); gtk_signal_connect( GTK_OBJECT(toplevel),"delete_event", GTK_SIGNAL_FUNC(gtk_main_quit),NULL ); diff -u client/gui-gtk/helpdlg.c /home/vasc/freeciv/client/gui-gtk/helpdlg.c --- client/gui-gtk/helpdlg.c Sun Jan 2 11:55:27 2000 +++ /home/vasc/freeciv/client/gui-gtk/helpdlg.c Wed Feb 9 15:33:36 2000 @@ -43,9 +43,6 @@ #include "helpdlg.h" -#define HELP_TEXT_FONT "-*-fixed-medium-r-*-*-14-*-*-*-*-*-iso8859-*" - - extern GtkWidget *toplevel; extern char long_buffer[64000]; /* helpdata.c */ @@ -287,7 +284,6 @@ { GtkWidget *hbox; GtkWidget *button; - GtkStyle *style; char *row [1]; int i, j; @@ -332,18 +328,12 @@ unit_tile = gtk_pixmap_new( create_overlay_unit( -1 ), NULL ); gtk_box_pack_start( GTK_BOX( help_box ), unit_tile, FALSE, FALSE, 0 ); - - - style = gtk_style_new( ); - style->fg[GTK_STATE_NORMAL] = *colors_standard[COLOR_STD_RED]; - - help_itable = gtk_table_new(6, 1, FALSE); gtk_box_pack_start(GTK_BOX(help_box), help_itable, FALSE, FALSE, 0); for (i=0; i<6; i++) { help_ilabel[i] = gtk_label_new(_(help_ilabel_name[i])); - gtk_widget_set_style(help_ilabel[i], style); + gtk_widget_set_name (help_ilabel[i], "help label"); if (i==5) { button = help_hyperlink_new(help_ilabel[i], HELP_TECH); @@ -359,7 +349,7 @@ for (i=0; i<6; i++) { help_wlabel[i] = gtk_label_new(_(help_wlabel_name[i])); - gtk_widget_set_style(help_wlabel[i], style); + gtk_widget_set_name (help_wlabel[i], "help label"); if (i==3 || i==5) { button = help_hyperlink_new(help_wlabel[i], HELP_TECH); @@ -378,7 +368,7 @@ for (j=0; j<5; j++) { help_ulabel[j][i] = gtk_label_new(_(help_ulabel_name[j][i])); - gtk_widget_set_style(help_ulabel[j][i], style); + gtk_widget_set_name (help_ulabel[j][i], "help label"); if (j==4 && (i==1 || i==4)) { @@ -403,7 +393,7 @@ for (j=0; j<4; j++) { help_tlabel[j][i] = gtk_label_new(_(help_tlabel_name[j][i])); - gtk_widget_set_style(help_tlabel[j][i], style); + gtk_widget_set_name (help_tlabel[j][i], "help label"); gtk_table_attach_defaults(GTK_TABLE(help_ttable), help_tlabel[j][i], i, i+1, j, j+1); @@ -415,18 +405,13 @@ help_text_scrolled = gtk_scrolled_window_new( NULL, NULL ); help_text = gtk_text_new( NULL, NULL ); + gtk_widget_set_name (help_text, "help text"); + gtk_container_add(GTK_CONTAINER (help_text_scrolled), help_text); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(help_text_scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); gtk_text_set_editable( GTK_TEXT( help_text ), FALSE ); gtk_box_pack_start( GTK_BOX( help_box ), help_text_scrolled, TRUE, TRUE, 0 ); - - style = gtk_style_new(); - gdk_font_unref (style->font); - style->font = gdk_font_load( HELP_TEXT_FONT ); - gdk_font_ref (style->font); - gtk_widget_set_style( help_text, style ); - gtk_widget_realize( help_text ); help_tree = gtk_ctree_new(1,0); gtk_clist_set_column_width(GTK_CLIST(help_tree), 0, GTK_CLIST(help_tree)->clist_window_width); diff -u client/gui-gtk/spaceshipdlg.c /home/vasc/freeciv/client/gui-gtk/spaceshipdlg.c --- client/gui-gtk/spaceshipdlg.c Sun Jan 2 11:55:28 2000 +++ /home/vasc/freeciv/client/gui-gtk/spaceshipdlg.c Wed Feb 9 15:49:21 2000 @@ -61,8 +61,6 @@ GtkWidget *close_command; }; -#define FIXED_12_BFONT "-b&h-lucidatypewriter-bold-r-normal-*-12-*-*-*-*-*-*-*" - static struct genlist dialog_list; static int dialog_list_has_been_initialised; @@ -173,7 +171,6 @@ { struct spaceship_dialog *pdialog; GtkWidget *hbox, *frame; - GtkStyle *style; pdialog=fc_malloc(sizeof(struct spaceship_dialog)); pdialog->pplayer=pplayer; @@ -202,11 +199,6 @@ gtk_container_add(GTK_CONTAINER (frame), pdialog->image_canvas); gtk_widget_realize(pdialog->image_canvas); - style=gtk_style_copy (GTK_WIDGET (pdialog->shell)->style); - gdk_font_unref (style->font); - style->font=gdk_font_load (FIXED_12_BFONT); - gdk_font_ref (style->font); - pdialog->info_label=gtk_label_new (_("Population: 1234\n" "Support: 100 %\n" "Energy: 100 %\n" @@ -217,7 +209,7 @@ gtk_label_set_justify (GTK_LABEL (pdialog->info_label), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment(GTK_MISC(pdialog->info_label), 0.0, 0.0); gtk_box_pack_start(GTK_BOX(hbox), pdialog->info_label, FALSE, FALSE, 0); - gtk_widget_set_style (pdialog->info_label, style); + gtk_widget_set_name (pdialog->info_label, "spaceship label"); pdialog->close_command=gtk_button_new_with_label (_("Close"));