Commit 7e8a0d71 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

removed the non-dialog variant (all color notebooks have "Cancel" and "OK"

2002-11-17  Michael Natterer  <mitch@gimp.org>

	* app/gui/color-notebook.c (color_notebook_new_internal): removed
	the non-dialog variant (all color notebooks have "Cancel" and "OK"
	buttons again). We have the color dockable which can be always
	open now and don't need this hack any more.
parent 12e0ec0b
2002-11-17 Michael Natterer <mitch@gimp.org>
* app/gui/color-notebook.c (color_notebook_new_internal): removed
the non-dialog variant (all color notebooks have "Cancel" and "OK"
buttons again). We have the color dockable which can be always
open now and don't need this hack any more.
2002-11-16 Manish Sing <yosh@gimp.org>
 
* app/plug-in/plug-in.c: use g_spawn_async now. If the OS/2 port
......
......@@ -315,39 +315,20 @@ color_notebook_new_internal (GimpViewable *viewable,
NULL);
}
if (wants_updates)
{
gimp_dialog_create_action_area (GIMP_DIALOG (cnp->shell),
"_delete_event_",
color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, TRUE,
gimp_dialog_create_action_area (GIMP_DIALOG (cnp->shell),
NULL);
GTK_STOCK_CANCEL,
color_notebook_cancel_callback,
cnp, NULL, NULL, FALSE, TRUE,
gtk_window_set_type_hint (GTK_WINDOW (cnp->shell),
GDK_WINDOW_TYPE_HINT_NORMAL);
GTK_STOCK_OK,
color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
gtk_dialog_set_has_separator (GTK_DIALOG (cnp->shell), FALSE);
gtk_widget_hide (GTK_DIALOG (cnp->shell)->action_area);
}
else
{
gimp_dialog_create_action_area (GIMP_DIALOG (cnp->shell),
GTK_STOCK_CANCEL,
color_notebook_cancel_callback,
cnp, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK,
color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
NULL);
}
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 2);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 4);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cnp->shell)->vbox), main_vbox);
gtk_widget_show (main_vbox);
......
......@@ -315,39 +315,20 @@ color_notebook_new_internal (GimpViewable *viewable,
NULL);
}
if (wants_updates)
{
gimp_dialog_create_action_area (GIMP_DIALOG (cnp->shell),
"_delete_event_",
color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, TRUE,
gimp_dialog_create_action_area (GIMP_DIALOG (cnp->shell),
NULL);
GTK_STOCK_CANCEL,
color_notebook_cancel_callback,
cnp, NULL, NULL, FALSE, TRUE,
gtk_window_set_type_hint (GTK_WINDOW (cnp->shell),
GDK_WINDOW_TYPE_HINT_NORMAL);
GTK_STOCK_OK,
color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
gtk_dialog_set_has_separator (GTK_DIALOG (cnp->shell), FALSE);
gtk_widget_hide (GTK_DIALOG (cnp->shell)->action_area);
}
else
{
gimp_dialog_create_action_area (GIMP_DIALOG (cnp->shell),
GTK_STOCK_CANCEL,
color_notebook_cancel_callback,
cnp, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK,
color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
NULL);
}
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 2);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 4);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cnp->shell)->vbox), main_vbox);
gtk_widget_show (main_vbox);
......
......@@ -315,39 +315,20 @@ color_notebook_new_internal (GimpViewable *viewable,
NULL);
}
if (wants_updates)
{
gimp_dialog_create_action_area (GIMP_DIALOG (cnp->shell),
"_delete_event_",
color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, TRUE,
gimp_dialog_create_action_area (GIMP_DIALOG (cnp->shell),
NULL);
GTK_STOCK_CANCEL,
color_notebook_cancel_callback,
cnp, NULL, NULL, FALSE, TRUE,
gtk_window_set_type_hint (GTK_WINDOW (cnp->shell),
GDK_WINDOW_TYPE_HINT_NORMAL);
GTK_STOCK_OK,
color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
gtk_dialog_set_has_separator (GTK_DIALOG (cnp->shell), FALSE);
gtk_widget_hide (GTK_DIALOG (cnp->shell)->action_area);
}
else
{
gimp_dialog_create_action_area (GIMP_DIALOG (cnp->shell),
GTK_STOCK_CANCEL,
color_notebook_cancel_callback,
cnp, NULL, NULL, FALSE, TRUE,
GTK_STOCK_OK,
color_notebook_ok_callback,
cnp, NULL, NULL, TRUE, FALSE,
NULL);
}
NULL);
main_vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 2);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 4);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cnp->shell)->vbox), main_vbox);
gtk_widget_show (main_vbox);
......
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