Commit 61cfa3f0 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

app/docindex.c more GObject porting.

2001-07-29  Sven Neumann  <sven@gimp.org>

	* app/docindex.c
	* app/ops_buttons.[ch]: more GObject porting.
parent 95a8c724
2001-07-29 Sven Neumann <sven@gimp.org>
* app/docindex.c
* app/ops_buttons.[ch]: more GObject porting.
2001-07-27 Sven Neumann <sven@gimp.org>
* app/core/core-types.h:
......
......@@ -100,37 +100,45 @@ static GList *idea_list = NULL;
/* the ops buttons */
static GtkSignalFunc open_ext_callbacks[] =
static GCallback open_ext_callbacks[] =
{
idea_open_or_raise_callback, file_open_cmd_callback, NULL, NULL
G_CALLBACK (idea_open_or_raise_callback),
G_CALLBACK (file_open_cmd_callback),
NULL, NULL
};
static GtkSignalFunc raise_ext_callbacks[] =
static GCallback raise_ext_callbacks[] =
{
idea_to_top_callback, NULL, NULL, NULL
G_CALLBACK (idea_to_top_callback),
NULL, NULL, NULL
};
static GtkSignalFunc lower_ext_callbacks[] =
static GCallback lower_ext_callbacks[] =
{
idea_to_bottom_callback, NULL, NULL, NULL
G_CALLBACK (idea_to_bottom_callback),
NULL, NULL, NULL
};
static OpsButton ops_buttons[] =
{
{ folder_xpm, idea_open_callback, open_ext_callbacks,
{ folder_xpm,
G_CALLBACK (idea_open_callback), open_ext_callbacks,
N_("Open the selected entry\n"
"<Shift> Raise window if already open\n"
"<Ctrl> Load Image dialog"), NULL,
NULL },
{ raise_xpm, idea_up_callback, raise_ext_callbacks,
{ raise_xpm,
G_CALLBACK (idea_up_callback), raise_ext_callbacks,
N_("Move the selected entry up in the index\n"
"<Shift> To top"), NULL,
NULL },
{ lower_xpm, idea_down_callback, lower_ext_callbacks,
{ lower_xpm,
G_CALLBACK (idea_down_callback), lower_ext_callbacks,
N_("Move the selected entry down in the index\n"
"<Shift> To bottom"), NULL,
NULL },
{ delete_xpm, idea_remove_callback, NULL,
{ delete_xpm,
G_CALLBACK (idea_remove_callback), NULL,
N_("Remove the selected entry from the index"), NULL,
NULL },
{ NULL, NULL, NULL, NULL, NULL, NULL }
......@@ -411,9 +419,9 @@ idea_add_in_position_with_select (gchar *title,
else
gtk_list_insert_items (GTK_LIST (ideas->list), list, position);
gtk_signal_connect (GTK_OBJECT (listitem), "button_press_event",
GTK_SIGNAL_FUNC (list_item_callback),
NULL);
g_signal_connect (G_OBJECT (listitem), "button_press_event",
G_CALLBACK (list_item_callback),
NULL);
gtk_widget_show (listitem);
......
......@@ -79,15 +79,15 @@ ops_button_box_new (OpsButton *ops_button,
if (ops_button->ext_callbacks == NULL)
{
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (ops_button->callback),
NULL);
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (ops_button->callback),
NULL);
}
else
{
gtk_signal_connect (GTK_OBJECT (button), "extended_clicked",
GTK_SIGNAL_FUNC (ops_button_extended_clicked),
ops_button);
g_signal_connect (G_OBJECT (button), "extended_clicked",
G_CALLBACK (ops_button_extended_clicked),
ops_button);
}
gimp_help_set_help_data (button,
......
......@@ -30,13 +30,13 @@ typedef struct _OpsButton OpsButton;
struct _OpsButton
{
gchar **xpm_data; /* xpm data for the button */
GtkSignalFunc callback; /* callback function */
GtkSignalFunc *ext_callbacks; /* callback functions when
* modifiers are pressed */
gchar *tooltip;
gchar *private_tip;
GtkWidget *widget; /* the button widget */
gchar **xpm_data; /* xpm data for the button */
GCallback callback; /* callback function */
GCallback *ext_callbacks; /* callback functions when *
* modifiers are pressed */
gchar *tooltip;
gchar *private_tip;
GtkWidget *widget; /* the button widget */
};
/* Function declarations */
......
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