callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/[all files using the dialog or action area constructors] added a

Browse Source 
2000-01-06  Michael Natterer  <mitch@gimp.org>

	* app/[all files using the dialog or action area constructors]
	* libgimp/gimpdialog.[ch]: added a "slot_object" agrument to the
	constructors' va_args lists to allow the action area buttons to be
	connected wich gtk_signal_connect_object().

	* libgimp/gimphelp.c: show the correct help page for plugins.

	* plug-ins/common/CEL.c
	* plug-ins/common/CML_explorer.c
	* plug-ins/common/Makefile.am
	* plug-ins/common/aa.c
	* plug-ins/common/align_layers.c
	* plug-ins/common/animationplay.c
	* plug-ins/common/apply_lens.c
	* plug-ins/common/blinds.c
	* plug-ins/common/blur.c
	* plug-ins/common/bumpmap.c
	* plug-ins/common/checkerboard.c
	* plug-ins/common/colorify.c
	* plug-ins/common/colortoalpha.c
	* plug-ins/common/compose.c
	* plug-ins/common/convmatrix.c
	* plug-ins/common/csource.c
	* plug-ins/common/cubism.c
	* plug-ins/common/curve_bend.c
	* plug-ins/common/decompose.c
	* plug-ins/common/deinterlace.c
	* plug-ins/common/depthmerge.c
	* plug-ins/common/despeckle.c
	* plug-ins/common/destripe.c
	* plug-ins/common/diffraction.c
	* plug-ins/common/displace.c
	* plug-ins/common/grid.c
	* plug-ins/helpbrowser/Makefile.am
	* plug-ins/helpbrowser/helpbrowser.c: use the dialog constructor
	and enable the "F1" help key.
This commit is contained in:
Michael Natterer
2000-01-06 16:40:17 +00:00
committed by Michael Natterer
parent 58561810b4
commit 884f223569
165 changed files with 1495 additions and 1676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libgimpwidgets/gimpdialog.c
View File

@ -87,6 +87,7 @@ gimp_dialog_new (const gchar *title,
* gchar *label,
* GtkSignalFunc callback,
* gpointer data,
* GtkObject *slot_object,
* GtkWidget **widget_ptr,
* gboolean default_action,
* gboolean connect_delete,
@ -170,6 +171,7 @@ gimp_dialog_create_action_area (GtkDialog *dialog,
* gchar *label,
* GtkSignalFunc callback,
* gpointer data,
* GtkObject *slot_object,
* GtkWidget **widget_ptr,
* gboolean default_action,
* gboolean connect_delete,
@ -197,6 +199,7 @@ gimp_dialog_create_action_areav (GtkDialog *dialog,
gchar *label;
GtkSignalFunc callback;
gpointer data;
GtkObject *slot_object;
GtkWidget **widget_ptr;
gboolean default_action;
gboolean connect_delete;
@ -223,9 +226,10 @@ gimp_dialog_create_action_areav (GtkDialog *dialog,
/* the action_area buttons */
while (label)
{
callback = va_arg (args, GtkSignalFunc);
data = va_arg (args, gpointer);
widget_ptr = va_arg (args, gpointer);
callback = va_arg (args, GtkSignalFunc);
data = va_arg (args, gpointer);
slot_object = va_arg (args, gpointer);
widget_ptr = va_arg (args, gpointer);
default_action = va_arg (args, gboolean);
connect_delete = va_arg (args, gboolean);
@ -233,11 +237,23 @@ gimp_dialog_create_action_areav (GtkDialog *dialog,
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
/* pass data as user_data if data != NULL, or the dialog otherwise */
if (slot_object == (GtkObject *) 1)
slot_object = (GtkObject *) dialog;
if (data == NULL)
data = dialog;
if (callback)
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (callback),
data ? data : dialog);
{
if (slot_object)
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (callback),
slot_object);
else
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (callback),
data);
}
if (widget_ptr)
*widget_ptr = button;
@ -249,12 +265,12 @@ gimp_dialog_create_action_areav (GtkDialog *dialog,
callback);
gtk_object_set_data (GTK_OBJECT (dialog),
"gimp_dialog_cancel_widget",
button);
slot_object ? slot_object : GTK_OBJECT (button));
/* catch the WM delete event */
gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
(GdkEventFunc) gimp_dialog_delete_callback,
data ? data : dialog);
data);
delete_connected = TRUE;
}