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

Replaced gtk_signal_connect by g_signal_connect

Browse Source
This commit is contained in:
Maurits Rijk
2003-01-06 22:11:17 +00:00
parent 59a4b7d0c6
commit b6232092e4
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-01-06 Maurits Rijk <lpeek.mrijk@consunet.nl>
* plug-ins/imagemap/imap_preview.c
* plug-ins/imagemap/imap_selection.c: replaced all gtk_signal_connect
by g_signal_connect.
2003-01-06 Tor Lillqvist <tml@iki.fi> 2003-01-06 Tor Lillqvist <tml@iki.fi>
* plug-ins/script-fu/script-fu-server.c: Bypass whole file on * plug-ins/script-fu/script-fu-server.c: Bypass whole file on

3
plug-ins/imagemap/imap_preview.c
View File

@ -291,8 +291,7 @@ arrow_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
{ {
if (event->button == 1) if (event->button == 1)
do_main_popup_menu(event); do_main_popup_menu(event);
gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event"); return TRUE;
return FALSE;
} }
static gboolean static gboolean

38
plug-ins/imagemap/imap_selection.c
View File

@ -3,7 +3,7 @@
* *
* Generates clickable image maps. * Generates clickable image maps.
* *
* Copyright (C) 1998-2002 Maurits Rijk lpeek.mrijk@consunet.nl * Copyright (C) 1998-2003 Maurits Rijk lpeek.mrijk@consunet.nl
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -89,7 +89,6 @@ select_row_cb(GtkWidget *widget, gint row, gint column, GdkEventButton *event,
subcommand_end(); subcommand_end();
} }
command_execute(command); command_execute(command);
redraw_preview(); /* Fix me! */
} }
} }
@ -104,7 +103,6 @@ unselect_row_cb(GtkWidget *widget, gint row, gint column,
Command_t *command; Command_t *command;
command = unselect_command_new(obj); command = unselect_command_new(obj);
command_execute(command); command_execute(command);
redraw_preview(); /* Fix me! */
} }
data->selected_child = NULL; data->selected_child = NULL;
set_buttons(data); set_buttons(data);
@ -118,7 +116,7 @@ row_move_cb(GtkWidget *widget, gint src, gint des)
static gboolean doubleclick; static gboolean doubleclick;
static void static gboolean
button_press_cb(GtkWidget *widget, GdkEventButton *event, Selection_t *data) button_press_cb(GtkWidget *widget, GdkEventButton *event, Selection_t *data)
{ {
if (event->button == 1) { if (event->button == 1) {
@ -134,13 +132,15 @@ button_press_cb(GtkWidget *widget, GdkEventButton *event, Selection_t *data)
doubleclick = TRUE; doubleclick = TRUE;
} }
} }
return FALSE;
} }
static void static gboolean
button_release_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) button_release_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
{ {
if (event->button == 1) if (event->button == 1)
doubleclick = FALSE; doubleclick = FALSE;
return FALSE;
} }
static void static void
@ -390,24 +390,24 @@ make_selection(ObjectList_t *object_list)
/* Drop support */ /* Drop support */
gtk_drag_dest_set(list, GTK_DEST_DEFAULT_ALL, target_table, gtk_drag_dest_set(list, GTK_DEST_DEFAULT_ALL, target_table,
2, GDK_ACTION_COPY); 2, GDK_ACTION_COPY);
gtk_signal_connect(GTK_OBJECT(list), "drag_data_received", g_signal_connect(G_OBJECT(list), "drag_data_received",
GTK_SIGNAL_FUNC(handle_drop), NULL); G_CALLBACK(handle_drop), NULL);
/* Callbacks we are interested in */ /* Callbacks we are interested in */
gtk_signal_connect(GTK_OBJECT(list), "click_column", g_signal_connect(G_OBJECT(list), "click_column",
GTK_SIGNAL_FUNC(toggle_order), data); G_CALLBACK(toggle_order), data);
gtk_signal_connect(GTK_OBJECT(list), "select_row", g_signal_connect(G_OBJECT(list), "select_row",
GTK_SIGNAL_FUNC(select_row_cb), data); G_CALLBACK(select_row_cb), data);
gtk_signal_connect(GTK_OBJECT(list), "unselect_row", g_signal_connect(G_OBJECT(list), "unselect_row",
GTK_SIGNAL_FUNC(unselect_row_cb), data); G_CALLBACK(unselect_row_cb), data);
gtk_signal_connect(GTK_OBJECT(list), "row_move", g_signal_connect(G_OBJECT(list), "row_move",
GTK_SIGNAL_FUNC(row_move_cb), data); G_CALLBACK(row_move_cb), data);
/* For handling doubleclick */ /* For handling doubleclick */
gtk_signal_connect(GTK_OBJECT(list), "button_press_event", g_signal_connect(G_OBJECT(list), "button_press_event",
GTK_SIGNAL_FUNC(button_press_cb), data); G_CALLBACK(button_press_cb), data);
gtk_signal_connect(GTK_OBJECT(list), "button_release_event", g_signal_connect(G_OBJECT(list), "button_release_event",
GTK_SIGNAL_FUNC(button_release_cb), data); G_CALLBACK(button_release_cb), data);
gtk_clist_set_selection_mode(GTK_CLIST(list), GTK_SELECTION_MULTIPLE); gtk_clist_set_selection_mode(GTK_CLIST(list), GTK_SELECTION_MULTIPLE);