diff --git a/ChangeLog b/ChangeLog index 24f9b77976..7dfe62915a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Sat Nov 14 20:02:31 GMT 1998 Austin Donnelly + + * app/rect_select.c: deal with zero-size selections correctly (ie, + select the whole image but don't show marching ants). + + * app/app_procs.c: sort out colourmap before creating splash + window, so if we need to install a private cmap then everything + will use it. + + * plug-ins/newsprint/newsprint.c: delete spurious debugging printf. + Fri Nov 13 23:07:22 MET 1998 Sven Neumann * app/gdisplay.[ch] diff --git a/app/app_procs.c b/app/app_procs.c index eb67bbf21a..915b02de65 100644 --- a/app/app_procs.c +++ b/app/app_procs.c @@ -344,6 +344,7 @@ make_initialization_status_window(void) GtkWidget *vbox; win_initstatus = gtk_window_new(GTK_WINDOW_DIALOG); + gtk_signal_connect (GTK_OBJECT (win_initstatus), "delete_event", GTK_SIGNAL_FUNC (gtk_true), NULL); @@ -359,14 +360,8 @@ make_initialization_status_window(void) vbox = gtk_vbox_new(FALSE, 4); gtk_container_add(GTK_CONTAINER(win_initstatus), vbox); - gtk_widget_push_visual (gtk_preview_get_visual ()); - gtk_widget_push_colormap (gtk_preview_get_cmap ()); - logo_area = gtk_drawing_area_new (); - gtk_widget_pop_colormap (); - gtk_widget_pop_visual (); - gtk_signal_connect (GTK_OBJECT (logo_area), "expose_event", (GtkSignalFunc) splash_logo_expose, NULL); logo_area_width = ( logo_width > LOGO_WIDTH_MIN ) ? logo_width : LOGO_WIDTH_MIN; @@ -463,6 +458,8 @@ app_init (void) gtk_rc_parse (filename); } + if (no_interface == FALSE) + get_standard_colormaps (); make_initialization_status_window(); if (no_interface == FALSE && no_splash == FALSE && win_initstatus) { splash_text_draw (logo_area); @@ -530,7 +527,6 @@ app_init (void) /* Things to do only if there is an interface */ if (no_interface == FALSE) { - get_standard_colormaps (); devices_init (); session_init (); create_toolbox (); diff --git a/app/rect_select.c b/app/rect_select.c index 9ede5f4259..6aac8bf68f 100644 --- a/app/rect_select.c +++ b/app/rect_select.c @@ -434,7 +434,7 @@ rect_select_button_release (Tool *tool, w = (rect_sel->w < 0) ? -rect_sel->w : rect_sel->w; h = (rect_sel->h < 0) ? -rect_sel->h : rect_sel->h; - if ((!w || !h) && !rect_sel->fixed_width) + if ((!w || !h) && !rect_sel->fixed_size) { /* If there is a floating selection, anchor it */ if (gimage_floating_sel (gdisp->gimage)) diff --git a/app/tools/gimprectselecttool.c b/app/tools/gimprectselecttool.c index 9ede5f4259..6aac8bf68f 100644 --- a/app/tools/gimprectselecttool.c +++ b/app/tools/gimprectselecttool.c @@ -434,7 +434,7 @@ rect_select_button_release (Tool *tool, w = (rect_sel->w < 0) ? -rect_sel->w : rect_sel->w; h = (rect_sel->h < 0) ? -rect_sel->h : rect_sel->h; - if ((!w || !h) && !rect_sel->fixed_width) + if ((!w || !h) && !rect_sel->fixed_size) { /* If there is a floating selection, anchor it */ if (gimage_floating_sel (gdisp->gimage)) diff --git a/app/tools/rect_select.c b/app/tools/rect_select.c index 9ede5f4259..6aac8bf68f 100644 --- a/app/tools/rect_select.c +++ b/app/tools/rect_select.c @@ -434,7 +434,7 @@ rect_select_button_release (Tool *tool, w = (rect_sel->w < 0) ? -rect_sel->w : rect_sel->w; h = (rect_sel->h < 0) ? -rect_sel->h : rect_sel->h; - if ((!w || !h) && !rect_sel->fixed_width) + if ((!w || !h) && !rect_sel->fixed_size) { /* If there is a floating selection, anchor it */ if (gimage_floating_sel (gdisp->gimage)) diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index 5d62bc8ade..9107bec486 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -1417,8 +1417,6 @@ newsprint_dialog (GDrawable *drawable) { channel_st **chst; - printf("making channels\n"); - gen_channels(&st, pvals.colourspace); chst = st.chst[pvals.colourspace]; diff --git a/plug-ins/newsprint/newsprint.c b/plug-ins/newsprint/newsprint.c index 5d62bc8ade..9107bec486 100644 --- a/plug-ins/newsprint/newsprint.c +++ b/plug-ins/newsprint/newsprint.c @@ -1417,8 +1417,6 @@ newsprint_dialog (GDrawable *drawable) { channel_st **chst; - printf("making channels\n"); - gen_channels(&st, pvals.colourspace); chst = st.chst[pvals.colourspace];