--- AUTHORS.orig Wed Apr 8 02:16:04 1998 +++ AUTHORS Thu Oct 5 21:29:22 2000 @@ -1,2 +1,2 @@ Hideki Fujimoto - +Trevor Johnson --- ChangeLog.orig Wed Apr 8 02:16:04 1998 +++ ChangeLog Thu Oct 5 21:30:47 2000 @@ -1,3 +1,7 @@ +1.0.a3+tj1 +========== +o updated for GTK+ 1.2.x + form 1.0.a2.withoutDND ====================== o added the menu which is depend on file's suffix. --- src/app_preference.c.orig Wed Apr 8 02:36:49 1998 +++ src/app_preference.c Thu Oct 5 16:47:28 2000 @@ -4,6 +4,8 @@ * Copyright (C) 1997, 1998 Hideki Fujimoto. */ +#include +#include #include #include #include @@ -1020,7 +1022,7 @@ removed_trayicon_p = removed_trayicon_p->next; gtk_widget_set_style(trayicon_current->gw_name_pref, style); - gtk_widget_draw_children(trayicon_current->gw_name_pref); + gtk_widget_show(trayicon_current->gw_name_pref); break; } else { @@ -1038,7 +1040,7 @@ removed_trayicon_p = removed_trayicon; gtk_widget_set_style(trayicon_current->gw_name_pref, style); - gtk_widget_draw_children(trayicon_current->gw_name_pref); + gtk_widget_show(trayicon_current->gw_name_pref); } } @@ -1054,7 +1056,7 @@ removed_trayicon_p = removed_trayicon_p->next; gtk_widget_set_style(trayicon_current->gw_name_pref, style); - gtk_widget_draw_children(trayicon_current->gw_name_pref); + gtk_widget_show(trayicon_current->gw_name_pref); break; } else { @@ -1072,7 +1074,7 @@ removed_trayicon_p = removed_trayicon; gtk_widget_set_style(trayicon_current->gw_name_pref, style); - gtk_widget_draw_children(trayicon_current->gw_name_pref); + gtk_widget_show(trayicon_current->gw_name_pref); } } } @@ -1204,7 +1206,7 @@ listbox = gtk_list_new (); gtk_list_set_selection_mode(GTK_LIST (listbox), GTK_SELECTION_BROWSE); - gtk_container_add(GTK_CONTAINER (swin), listbox); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), listbox); gtk_widget_show(listbox); /* make list */ --- src/commands.c.orig Wed Apr 8 02:36:49 1998 +++ src/commands.c Thu Oct 5 16:47:28 2000 @@ -3,6 +3,7 @@ * This file is a part of the Workplace. * Copyright (C) 1997, 1998 Hideki Fujimoto. */ +#include #include #include #include --- src/file_preference.c.orig Wed Apr 8 02:36:49 1998 +++ src/file_preference.c Thu Oct 5 16:47:28 2000 @@ -4,6 +4,7 @@ * Copyright (C) 1997, 1998 Hideki Fujimoto. */ +#include #include #include #include @@ -97,7 +98,7 @@ static GtkWidget *entry_owner; static GtkWidget *entry_group; -static changed_mode = 0; +static int changed_mode = 0; void init_FilePreference(const char *path, Fileinfo *fi) --- src/files.c.orig Wed Apr 8 02:36:49 1998 +++ src/files.c Thu Oct 5 16:47:28 2000 @@ -4,6 +4,8 @@ * Copyright (C) 1997, 1998 Hideki Fujimoto. */ +#include +#include #include #include #include --- src/gui_preference.c.orig Wed Apr 8 02:36:49 1998 +++ src/gui_preference.c Thu Oct 5 21:16:34 2000 @@ -56,7 +56,7 @@ /* Create the main window */ preference_window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_container_border_width(GTK_CONTAINER(preference_window), 10); - gtk_window_set_title(GTK_WINDOW(preference_window), "Preference"); + gtk_window_set_title(GTK_WINDOW(preference_window), "Preferences"); gtk_window_position(GTK_WINDOW(preference_window), GTK_WIN_POS_CENTER); gtk_signal_connect(GTK_OBJECT(preference_window), "delete_event", GTK_SIGNAL_FUNC(destroy_PreferenceWindow), NULL); --- src/if_directory.c.orig Wed Apr 8 02:36:49 1998 +++ src/if_directory.c Thu Oct 5 16:50:20 2000 @@ -4,6 +4,7 @@ * Copyright (C) 1997, 1998 Hideki Fujimoto. */ +#include #include #include #include @@ -129,7 +130,7 @@ /* This widget contains bookmarks (path) */ index_box = gtk_vbox_new(FALSE, 2); - gtk_container_add (GTK_CONTAINER(window), index_box); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(window), index_box); gtk_widget_show(index_box); /* run */ @@ -317,14 +318,14 @@ /* remove old emphasize */ if (emphasized_dindex->window) gdk_window_clear(emphasized_dindex->window); - gtk_widget_draw_children(emphasized_dindex); + gtk_widget_show(emphasized_dindex); emphasized_dindex = NULL; } if (emphasized_dindex2) { /* remove old emphasize */ if (emphasized_dindex2->window) gdk_window_clear(emphasized_dindex2->window); - gtk_widget_draw_children(emphasized_dindex2); + gtk_widget_show(emphasized_dindex2); emphasized_dindex2 = NULL; } emphasized_dindex = current_dindex->box->parent; @@ -388,13 +389,13 @@ /* rectangle (x, y, width, height) */ gdk_draw_rectangle((GdkDrawable *) widget->window, widget->style->white_gc, TRUE, 0, 0, widget->allocation.width, widget->allocation.height); - gtk_widget_draw_children(widget); + gtk_widget_show(widget); } if (emphasized_dindex2 == widget) { /* rectangle (x, y, width, height) */ gdk_draw_rectangle((GdkDrawable *) widget->window, widget->style->white_gc, TRUE, 0, 0, widget->allocation.width, widget->allocation.height); - gtk_widget_draw_children(widget); + gtk_widget_show(widget); } } @@ -404,7 +405,7 @@ /* rectangle (x, y, width, height) */ gdk_draw_rectangle((GdkDrawable *) widget->window, widget->style->white_gc, TRUE, 0, 0, widget->allocation.width, widget->allocation.height); - gtk_widget_draw_children(widget); + gtk_widget_show(widget); } static void --- src/if_workplace.c.orig Wed Apr 8 02:36:49 1998 +++ src/if_workplace.c Thu Oct 5 20:37:27 2000 @@ -4,6 +4,7 @@ * Copyright (C) 1997, 1998 Hideki Fujimoto. */ +#include #include #include #include @@ -154,15 +155,13 @@ if (Display_type == ICON) { /* window */ window = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (window), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER (parent), window); gtk_widget_show(window); /* This widget contains everything */ workplace = gtk_fixed_new (); - gtk_container_add (GTK_CONTAINER (window), workplace); + //gtk_container_add (GTK_CONTAINER (window), workplace); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(window), workplace); gtk_widget_show(workplace); /* init popup menu */ @@ -176,8 +175,6 @@ workplace = gtk_clist_new_with_titles(4, list_titles); gtk_clist_set_selection_mode(GTK_CLIST(workplace), GTK_SELECTION_BROWSE); - gtk_clist_set_policy(GTK_CLIST(workplace), GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); gtk_container_border_width (GTK_CONTAINER (workplace), 5); gtk_signal_connect(GTK_OBJECT(workplace),"click_column", GTK_SIGNAL_FUNC(press_column_handler), NULL); @@ -212,14 +209,14 @@ /* remove old emphasize */ if (emphasized_icon_image->window) gdk_window_clear(emphasized_icon_image->window); - gtk_widget_draw_children(emphasized_icon_image); + gtk_widget_show(emphasized_icon_image); emphasized_icon_image = NULL; } if (emphasized_icon_label) { /* remove old emphasize */ if (emphasized_icon_label->window) gdk_window_clear(emphasized_icon_label->window); - gtk_widget_draw_children(emphasized_icon_label); + gtk_widget_show(emphasized_icon_label); emphasized_icon_label = NULL; } current_file = NULL; @@ -609,7 +606,7 @@ gdk_draw_arc((GdkDrawable *) widget->window, widget->style->white_gc, TRUE, IMAGE_WIDTH -16, IMAGE_HEIGHT -16, 16, 16, 270*64,360*64); - gtk_widget_draw_children(widget); + gtk_widget_show(widget); } } @@ -623,7 +620,7 @@ /* rectangle (x, y, width, height) */ gdk_draw_rectangle((GdkDrawable *) widget->window, widget->style->white_gc, TRUE, 0, 0, widget->allocation.width, widget->allocation.height); - gtk_widget_draw_children(widget); + gtk_widget_show(widget); } } @@ -645,13 +642,13 @@ /* remove old emphasize */ if (emphasized_icon_image->window) gdk_window_clear(emphasized_icon_image->window); - gtk_widget_draw_children(emphasized_icon_image); + gtk_widget_show(emphasized_icon_image); } if (emphasized_icon_label) { /* remove old emphasize */ if (emphasized_icon_label->window) gdk_window_clear(emphasized_icon_label->window); - gtk_widget_draw_children(emphasized_icon_label); + gtk_widget_show(emphasized_icon_label); } /* do emphasize */ --- src/misc_preference.c.orig Wed Apr 8 02:36:49 1998 +++ src/misc_preference.c Thu Oct 5 16:47:28 2000 @@ -156,7 +156,7 @@ scut_listbox = gtk_list_new (); gtk_list_set_selection_mode(GTK_LIST (scut_listbox), GTK_SELECTION_BROWSE); - gtk_container_add(GTK_CONTAINER (swin), scut_listbox); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), scut_listbox); gtk_widget_show(scut_listbox); /* custom shortcut */ --- src/page_preference.c.orig Wed Apr 8 02:36:49 1998 +++ src/page_preference.c Thu Oct 5 16:47:28 2000 @@ -337,7 +337,7 @@ removed_page_p = removed_page_p->next; gtk_widget_set_style(page_current->gw_name_pref, style); - gtk_widget_draw_children(page_current->gw_name_pref); + gtk_widget_show(page_current->gw_name_pref); break; } else { @@ -355,7 +355,7 @@ removed_page_p = removed_page; gtk_widget_set_style(page_current->gw_name_pref, style); - gtk_widget_draw_children(page_current->gw_name_pref); + gtk_widget_show(page_current->gw_name_pref); } } @@ -371,7 +371,7 @@ removed_page_p = removed_page_p->next; gtk_widget_set_style(page_current->gw_name_pref, style); - gtk_widget_draw_children(page_current->gw_name_pref); + gtk_widget_show(page_current->gw_name_pref); break; } else { @@ -389,7 +389,7 @@ removed_page_p = removed_page; gtk_widget_set_style(page_current->gw_name_pref, style); - gtk_widget_draw_children(page_current->gw_name_pref); + gtk_widget_show(page_current->gw_name_pref); } } } --- src/pref_launcher.c.orig Wed Apr 8 02:36:49 1998 +++ src/pref_launcher.c Thu Oct 5 20:29:45 2000 @@ -79,7 +79,7 @@ /* left box */ left_box = gtk_vbox_new(FALSE, 10); gtk_container_border_width(GTK_CONTAINER(left_box), 4); - gtk_container_add(GTK_CONTAINER(window), left_box); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(window), left_box); gtk_widget_show(left_box); /* right box */ @@ -579,8 +579,8 @@ gdk_window_clear(emphasized_arrow->window); if (emphasized_pagename->window) gdk_window_clear(emphasized_pagename->window); - gtk_widget_draw_children(emphasized_arrow); - gtk_widget_draw_children(emphasized_pagename); + gtk_widget_show(emphasized_arrow); + gtk_widget_show(emphasized_pagename); emphasized_arrow = NULL; emphasized_pagename = NULL; } @@ -588,7 +588,7 @@ /* remove old emphasize */ if (emphasized_appname->window) gdk_window_clear(emphasized_appname->window); - gtk_widget_draw_children(emphasized_appname); + gtk_widget_show(emphasized_appname); emphasized_appname = NULL; } @@ -601,13 +601,13 @@ /* rectangle (x, y, width, height) */ gdk_draw_rectangle((GdkDrawable *) widget->window, widget->style->white_gc, TRUE, 0, 0, widget->allocation.width, widget->allocation.height); - gtk_widget_draw_children(widget); + gtk_widget_show(widget); } else if (emphasized_arrow == widget && GTK_WIDGET_VISIBLE(widget) && widget->window ) { /* rectangle (x, y, width, height) */ gdk_draw_rectangle((GdkDrawable *) widget->window, widget->style->white_gc, TRUE, 0, 0, widget->allocation.width, widget->allocation.height); - gtk_widget_draw_children(widget); + gtk_widget_show(widget); } } @@ -618,7 +618,7 @@ /* rectangle (x, y, width, height) */ gdk_draw_rectangle((GdkDrawable *) widget->window, widget->style->white_gc, TRUE, 0, 0, widget->allocation.width, widget->allocation.height); - gtk_widget_draw_children(widget); + gtk_widget_show(widget); } } --- src/pref_suffix.c.orig Wed Apr 8 02:36:49 1998 +++ src/pref_suffix.c Thu Oct 5 22:25:48 2000 @@ -4,6 +4,7 @@ * Copyright (C) 1997, 1998 Hideki Fujimoto. */ +#include #include #include #include @@ -104,8 +105,6 @@ /* window */ window = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_usize(window, 130, PW_COMPONET_HEIGHT-30); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(window),GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); gtk_box_pack_start(GTK_BOX(main_box), window, FALSE, FALSE, 0); gtk_widget_show(window); @@ -113,7 +112,8 @@ /* left box */ left_box = gtk_vbox_new(FALSE, 10); gtk_container_border_width(GTK_CONTAINER(left_box), 4); - gtk_container_add(GTK_CONTAINER(window), left_box); + //gtk_container_add(GTK_CONTAINER(window), left_box); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(window), left_box); gtk_widget_show(left_box); /* right box */ @@ -598,7 +598,7 @@ gtk_widget_show(label); /* set widget */ - buf->gw_pref = NULL; +// buf->gw_pref = NULL; // XXX buf = suffix_data; while (1) { @@ -889,7 +889,8 @@ listbox = gtk_list_new (); gtk_list_set_selection_mode(GTK_LIST (listbox), GTK_SELECTION_BROWSE); - gtk_container_add(GTK_CONTAINER (swin), listbox); + //gtk_container_add(GTK_CONTAINER (swin), listbox); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), listbox); gtk_widget_show(listbox); /* make list */ @@ -1153,7 +1154,7 @@ if (emphasized_suffixname) { if (emphasized_suffixname->window) gdk_window_clear(emphasized_suffixname->window); - gtk_widget_draw_children(emphasized_suffixname); + gtk_widget_show(emphasized_suffixname); } emphasized_suffixname = event_box; emphasize_suffixname(emphasized_suffixname); @@ -1301,7 +1302,7 @@ /* change label */ if (new_menu_p->data->suffix) - gtk_label_set(GTK_LABEL(new_menu_p->data->gw_pref), new_menu_p->data->suffix); +// gtk_label_set(GTK_LABEL(new_menu_p->data->gw_pref), new_menu_p->data->suffix); new_tmp = NULL; new_widget_tmp = NULL; @@ -1338,7 +1339,7 @@ } gtk_widget_set_style(current_data->gw_pref , style); - gtk_widget_draw_children(current_data->gw_pref ); + gtk_widget_show(current_data->gw_pref ); } @@ -1737,7 +1738,7 @@ if (emphasized_suffixname) { if (emphasized_suffixname->window) gdk_window_clear(emphasized_suffixname->window); - gtk_widget_draw_children(emphasized_suffixname); + gtk_widget_show(emphasized_suffixname); } emphasized_suffixname = widget; emphasize_suffixname(emphasized_suffixname); @@ -2117,7 +2118,7 @@ /* rectangle (x, y, width, height) */ gdk_draw_rectangle((GdkDrawable *) widget->window, widget->style->white_gc, TRUE, 0, 0, widget->allocation.width, widget->allocation.height); - gtk_widget_draw_children(widget); + gtk_widget_show(widget); } } --- src/preferences.c.orig Wed Apr 8 02:36:49 1998 +++ src/preferences.c Thu Oct 5 16:47:28 2000 @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include --- src/suffix.c.orig Wed Apr 8 02:36:49 1998 +++ src/suffix.c Thu Oct 5 21:03:03 2000 @@ -4,6 +4,7 @@ * Copyright (C) 1997, 1998 Hideki Fujimoto. */ +#include #include #include #include @@ -276,10 +277,11 @@ /* 1st */ strcat(buf, "\tITEM0_NAME = "); - if (buf_suffix->name0) + if (buf_suffix->name0) /* XXX crash on exit when buf_suffix is used */ { strcat(buf, buf_suffix->name0); - else + } else { strcat(buf, "NULL"); + } strcat(buf, ";\n"); strcat(buf, "\tITEM0_CMD = "); if (buf_suffix->cmd0) --- src/toolbar.c.orig Wed Apr 8 02:36:49 1998 +++ src/toolbar.c Thu Oct 5 20:59:02 2000 @@ -69,7 +69,7 @@ gtk_widget_show(button); /* button */ - button = gtk_button_new_with_label(" Preference "); + button = gtk_button_new_with_label(" Preferences "); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_PreferenceWindow), NULL); gtk_box_pack_start(GTK_BOX(main_box), button, FALSE, FALSE, 0);