Commit 821bbbc4 authored by EDT 1998 Matthew Wilson's avatar EDT 1998 Matthew Wilson Committed by Matt Wilson

Another small change to keep the segfaults away An attempt to squelch some

Thu Apr 30 03:15:51 EDT 1998 Matthew Wilson <msw@gimp.org>

        * app/curves.c: Another small change to keep the segfaults away
        * app/disp_callbacks.c: An attempt to squelch some warnings
--Matt
parent c8888faf
Thu Apr 30 03:15:51 EDT 1998 Matthew Wilson <msw@gimp.org>
* app/curves.c: Another small change to keep the segfaults away
* app/disp_callbacks.c: An attempt to squelch some warnings
Thu Apr 30 02:08:23 EDT 1998 Matthew Wilson <msw@gimp.org>
* app/channels_dialog.c
......
......@@ -353,8 +353,6 @@ curves_initialize (void *gdisp_ptr)
/* The curves dialog */
if (!curves_dialog)
curves_dialog = curves_new_dialog ();
else if (!GTK_WIDGET_VISIBLE (curves_dialog->shell))
gtk_widget_show (curves_dialog->shell);
/* Initialize the values */
curves_dialog->channel = HISTOGRAM_VALUE;
......@@ -397,6 +395,8 @@ curves_initialize (void *gdisp_ptr)
/* set the current selection */
gtk_option_menu_set_history ( GTK_OPTION_MENU (curves_dialog->channel_menu), 0);
if (!GTK_WIDGET_VISIBLE (curves_dialog->shell))
gtk_widget_show (curves_dialog->shell);
curves_update (curves_dialog, GRAPH | DRAW);
......@@ -575,7 +575,6 @@ curves_new_dialog ()
build_action_area (GTK_DIALOG (cd->shell), action_items, 3, 0);
gtk_widget_show (vbox);
gtk_widget_show (cd->shell);
return cd;
}
......
......@@ -353,8 +353,6 @@ curves_initialize (void *gdisp_ptr)
/* The curves dialog */
if (!curves_dialog)
curves_dialog = curves_new_dialog ();
else if (!GTK_WIDGET_VISIBLE (curves_dialog->shell))
gtk_widget_show (curves_dialog->shell);
/* Initialize the values */
curves_dialog->channel = HISTOGRAM_VALUE;
......@@ -397,6 +395,8 @@ curves_initialize (void *gdisp_ptr)
/* set the current selection */
gtk_option_menu_set_history ( GTK_OPTION_MENU (curves_dialog->channel_menu), 0);
if (!GTK_WIDGET_VISIBLE (curves_dialog->shell))
gtk_widget_show (curves_dialog->shell);
curves_update (curves_dialog, GRAPH | DRAW);
......@@ -575,7 +575,6 @@ curves_new_dialog ()
build_action_area (GTK_DIALOG (cd->shell), action_items, 3, 0);
gtk_widget_show (vbox);
gtk_widget_show (cd->shell);
return cd;
}
......
......@@ -177,8 +177,8 @@ gdisplay_canvas_events (GtkWidget *canvas,
*/
/* reset the current tool if we're changing drawables */
if (active_tool->drawable) {
if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) !=
drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) &&
if (((gimage_active_drawable(gdisp->gimage)) !=
active_tool->drawable) &&
!active_tool->preserve)
tools_initialize (active_tool->type, gdisp);
} else
......
......@@ -177,8 +177,8 @@ gdisplay_canvas_events (GtkWidget *canvas,
*/
/* reset the current tool if we're changing drawables */
if (active_tool->drawable) {
if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) !=
drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) &&
if (((gimage_active_drawable(gdisp->gimage)) !=
active_tool->drawable) &&
!active_tool->preserve)
tools_initialize (active_tool->type, gdisp);
} else
......
......@@ -177,8 +177,8 @@ gdisplay_canvas_events (GtkWidget *canvas,
*/
/* reset the current tool if we're changing drawables */
if (active_tool->drawable) {
if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) !=
drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) &&
if (((gimage_active_drawable(gdisp->gimage)) !=
active_tool->drawable) &&
!active_tool->preserve)
tools_initialize (active_tool->type, gdisp);
} else
......
......@@ -353,8 +353,6 @@ curves_initialize (void *gdisp_ptr)
/* The curves dialog */
if (!curves_dialog)
curves_dialog = curves_new_dialog ();
else if (!GTK_WIDGET_VISIBLE (curves_dialog->shell))
gtk_widget_show (curves_dialog->shell);
/* Initialize the values */
curves_dialog->channel = HISTOGRAM_VALUE;
......@@ -397,6 +395,8 @@ curves_initialize (void *gdisp_ptr)
/* set the current selection */
gtk_option_menu_set_history ( GTK_OPTION_MENU (curves_dialog->channel_menu), 0);
if (!GTK_WIDGET_VISIBLE (curves_dialog->shell))
gtk_widget_show (curves_dialog->shell);
curves_update (curves_dialog, GRAPH | DRAW);
......@@ -575,7 +575,6 @@ curves_new_dialog ()
build_action_area (GTK_DIALOG (cd->shell), action_items, 3, 0);
gtk_widget_show (vbox);
gtk_widget_show (cd->shell);
return cd;
}
......
......@@ -353,8 +353,6 @@ curves_initialize (void *gdisp_ptr)
/* The curves dialog */
if (!curves_dialog)
curves_dialog = curves_new_dialog ();
else if (!GTK_WIDGET_VISIBLE (curves_dialog->shell))
gtk_widget_show (curves_dialog->shell);
/* Initialize the values */
curves_dialog->channel = HISTOGRAM_VALUE;
......@@ -397,6 +395,8 @@ curves_initialize (void *gdisp_ptr)
/* set the current selection */
gtk_option_menu_set_history ( GTK_OPTION_MENU (curves_dialog->channel_menu), 0);
if (!GTK_WIDGET_VISIBLE (curves_dialog->shell))
gtk_widget_show (curves_dialog->shell);
curves_update (curves_dialog, GRAPH | DRAW);
......@@ -575,7 +575,6 @@ curves_new_dialog ()
build_action_area (GTK_DIALOG (cd->shell), action_items, 3, 0);
gtk_widget_show (vbox);
gtk_widget_show (cd->shell);
return cd;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment