Commit 2b52f8a8 authored by Tim Janik's avatar Tim Janik
Browse files

fixed a lot of the destroy handlers and delete_event handlers, still

        not everything perfect, though.
-timj
parent 1fe238af
......@@ -122,8 +122,6 @@ about_dialog_create (int timeout)
gtk_window_position (GTK_WINDOW (about_dialog), GTK_WIN_POS_CENTER);
gtk_signal_connect (GTK_OBJECT (about_dialog), "destroy",
(GtkSignalFunc) about_dialog_destroy, NULL);
gtk_signal_connect (GTK_OBJECT (about_dialog), "delete_event",
(GtkSignalFunc) about_dialog_destroy, NULL);
gtk_signal_connect (GTK_OBJECT (about_dialog), "unmap_event",
(GtkSignalFunc) about_dialog_unmap, NULL);
gtk_signal_connect (GTK_OBJECT (about_dialog), "button_press_event",
......
......@@ -232,7 +232,7 @@ file_new_delete_callback (GtkWidget *widget,
{
file_new_cancel_callback (widget, data);
return FALSE;
return TRUE;
}
......@@ -751,7 +751,7 @@ file_prefs_delete_callback (GtkWidget *widget,
file_prefs_cancel_callback (widget, dlg);
/* the widget is already destroyed here no need to try again */
return FALSE;
return TRUE;
}
static void
......@@ -2457,7 +2457,7 @@ image_delete_callback (GtkWidget *w,
{
image_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
......
......@@ -318,6 +318,9 @@ 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);
gtk_window_set_wmclass (GTK_WINDOW(win_initstatus), "gimp_startup", "Gimp");
gtk_window_set_title(GTK_WINDOW(win_initstatus),
"GIMP Startup");
......@@ -584,7 +587,7 @@ really_quit_delete_callback (GtkWidget *widget,
{
really_quit_cancel_callback (GTK_BUTTON(widget), (GtkWidget *) client_data);
return FALSE;
return TRUE;
}
static void
......
......@@ -643,7 +643,7 @@ color_balance_delete_callback (GtkWidget *w,
{
color_balance_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......
......@@ -1001,7 +1001,7 @@ curves_delete_callback (GtkWidget *w,
{
curves_cancel_callback (w, data);
return FALSE;
return TRUE;
}
static void
curves_preview_update (GtkWidget *w,
......
......@@ -754,7 +754,7 @@ hue_saturation_delete_callback (GtkWidget *w,
{
hue_saturation_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......
......@@ -512,7 +512,7 @@ threshold_delete_callback (GtkWidget *w,
{
threshold_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......
......@@ -505,7 +505,7 @@ brightness_contrast_delete_callback (GtkWidget *w,
{
brightness_contrast_cancel_callback (w, d);
return FALSE;
return TRUE;
}
static void
......
......@@ -734,7 +734,7 @@ brush_select_delete_callback (GtkWidget *w, GdkEvent *e, gpointer data)
{
brush_select_close_callback (w, data);
return FALSE;
return TRUE;
}
static void
......
......@@ -852,7 +852,7 @@ by_color_select_delete_callback (GtkWidget *w,
{
by_color_select_close_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......
......@@ -485,7 +485,7 @@ offset_delete_callback (GtkWidget *widget,
{
offset_cancel_callback (widget, data);
return FALSE;
return TRUE;
}
static void
......
......@@ -1689,7 +1689,7 @@ new_channel_query_delete_callback (GtkWidget *w,
{
new_channel_query_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......@@ -1868,7 +1868,7 @@ edit_channel_query_delete_callback (GtkWidget *w,
{
edit_channel_query_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......
......@@ -643,7 +643,7 @@ color_balance_delete_callback (GtkWidget *w,
{
color_balance_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......
......@@ -788,7 +788,7 @@ color_select_delete_callback (GtkWidget *w,
{
color_select_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
......
......@@ -232,7 +232,7 @@ file_new_delete_callback (GtkWidget *widget,
{
file_new_cancel_callback (widget, data);
return FALSE;
return TRUE;
}
......@@ -751,7 +751,7 @@ file_prefs_delete_callback (GtkWidget *widget,
file_prefs_cancel_callback (widget, dlg);
/* the widget is already destroyed here no need to try again */
return FALSE;
return TRUE;
}
static void
......@@ -2457,7 +2457,7 @@ image_delete_callback (GtkWidget *w,
{
image_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
......
......@@ -529,6 +529,7 @@ indexed_ok_callback (GtkWidget *widget,
gtk_widget_destroy (dialog->shell);
g_free (dialog);
dialog = NULL;
}
static gint
......@@ -538,7 +539,7 @@ indexed_delete_callback (GtkWidget *w,
{
indexed_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......@@ -550,6 +551,7 @@ indexed_cancel_callback (GtkWidget *widget,
dialog = (IndexedDialog *) client_data;
gtk_widget_destroy (dialog->shell);
g_free (dialog);
dialog = NULL;
}
static void
......
......@@ -552,7 +552,7 @@ named_buffer_dialog_delete_callback (GtkWidget *w,
{
named_buffer_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......
......@@ -485,7 +485,7 @@ offset_delete_callback (GtkWidget *widget,
{
offset_cancel_callback (widget, data);
return FALSE;
return TRUE;
}
static void
......
......@@ -552,7 +552,7 @@ named_buffer_dialog_delete_callback (GtkWidget *w,
{
named_buffer_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......
......@@ -529,6 +529,7 @@ indexed_ok_callback (GtkWidget *widget,
gtk_widget_destroy (dialog->shell);
g_free (dialog);
dialog = NULL;
}
static gint
......@@ -538,7 +539,7 @@ indexed_delete_callback (GtkWidget *w,
{
indexed_cancel_callback (w, client_data);
return FALSE;
return TRUE;
}
static void
......@@ -550,6 +551,7 @@ indexed_cancel_callback (GtkWidget *widget,
dialog = (IndexedDialog *) client_data;
gtk_widget_destroy (dialog->shell);
g_free (dialog);
dialog = NULL;
}
static void
......
Supports Markdown
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