AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

adapt to GSignal signature changes.

Browse Source 
Fri Oct 27 18:51:44 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtksignal.[hc]: adapt to GSignal signature changes.
This commit is contained in:
Tim Janik 2000-10-27 16:48:59 +00:00 committed by Tim Janik
parent 666b55720b
commit 1f0b90b796
12 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Oct 27 18:51:44 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: adapt to GSignal signature changes.
2000-10-27 Robert Brady <robert@suse.co.uk> 2000-10-27 Robert Brady <robert@suse.co.uk>
* configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic),

4
ChangeLog.pre-2-0
View File

@ -1,3 +1,7 @@
Fri Oct 27 18:51:44 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: adapt to GSignal signature changes.
2000-10-27 Robert Brady <robert@suse.co.uk> 2000-10-27 Robert Brady <robert@suse.co.uk>
* configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic),

4
ChangeLog.pre-2-10
View File

@ -1,3 +1,7 @@
Fri Oct 27 18:51:44 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: adapt to GSignal signature changes.
2000-10-27 Robert Brady <robert@suse.co.uk> 2000-10-27 Robert Brady <robert@suse.co.uk>
* configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic),

4
ChangeLog.pre-2-2
View File

@ -1,3 +1,7 @@
Fri Oct 27 18:51:44 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: adapt to GSignal signature changes.
2000-10-27 Robert Brady <robert@suse.co.uk> 2000-10-27 Robert Brady <robert@suse.co.uk>
* configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic),

4
ChangeLog.pre-2-4
View File

@ -1,3 +1,7 @@
Fri Oct 27 18:51:44 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: adapt to GSignal signature changes.
2000-10-27 Robert Brady <robert@suse.co.uk> 2000-10-27 Robert Brady <robert@suse.co.uk>
* configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic),

4
ChangeLog.pre-2-6
View File

@ -1,3 +1,7 @@
Fri Oct 27 18:51:44 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: adapt to GSignal signature changes.
2000-10-27 Robert Brady <robert@suse.co.uk> 2000-10-27 Robert Brady <robert@suse.co.uk>
* configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic),

4
ChangeLog.pre-2-8
View File

@ -1,3 +1,7 @@
Fri Oct 27 18:51:44 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: adapt to GSignal signature changes.
2000-10-27 Robert Brady <robert@suse.co.uk> 2000-10-27 Robert Brady <robert@suse.co.uk>
* configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic),

2
gtk/Makefile.am
View File

@ -450,7 +450,7 @@ $(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h
&& (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \ && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
&& rm -f xgen-gmh xgen-gmh~ \ && rm -f xgen-gmh xgen-gmh~ \
&& echo timestamp > $(@F) && echo timestamp > $(@F)
$(srcdir)/gtkmarshal.c: $(srcdir)/stamp-gtkmarshal.h $(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h
cd $(srcdir) \ cd $(srcdir) \
&& glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \ && glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc gtkmarshal.c \ && cp xgen-gmc gtkmarshal.c \

1
gtk/gtkmarshal.list
View File

@ -21,7 +21,6 @@
# NONE deprecated alias for VOID # NONE deprecated alias for VOID
# BOOL deprecated alias for BOOLEAN # BOOL deprecated alias for BOOLEAN
BOOLEAN:POINTER BOOLEAN:POINTER
BOOLEAN:POINTER,INT,INT BOOLEAN:POINTER,INT,INT
BOOLEAN:POINTER,INT,INT,UINT BOOLEAN:POINTER,INT,INT,UINT

1
gtk/gtkmarshalers.list
View File

@ -21,7 +21,6 @@
# NONE deprecated alias for VOID # NONE deprecated alias for VOID
# BOOL deprecated alias for BOOLEAN # BOOL deprecated alias for BOOLEAN
BOOLEAN:POINTER BOOLEAN:POINTER
BOOLEAN:POINTER,INT,INT BOOLEAN:POINTER,INT,INT
BOOLEAN:POINTER,INT,INT,UINT BOOLEAN:POINTER,INT,INT,UINT

12
gtk/gtksignal.c
View File

@ -94,7 +94,7 @@ gtk_signal_emit_stop_by_name (GtkObject *object,
{ {
g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (GTK_IS_OBJECT (object));
g_signal_stop_emission (object, g_signal_lookup (name, G_OBJECT_TYPE (object))); g_signal_stop_emission (object, g_signal_lookup (name, G_OBJECT_TYPE (object)), 0);
} }
void void
@ -106,7 +106,7 @@ gtk_signal_connect_object_while_alive (GtkObject *object,
g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (GTK_IS_OBJECT (object));
g_signal_connect_closure (object, g_signal_connect_closure (object,
g_signal_lookup (signal, G_OBJECT_TYPE (object)), g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0,
g_cclosure_new_object_swap (func, alive_object), g_cclosure_new_object_swap (func, alive_object),
FALSE); FALSE);
} }
@ -125,7 +125,7 @@ gtk_signal_connect_while_alive (GtkObject *object,
closure = g_cclosure_new (func, func_data, NULL); closure = g_cclosure_new (func, func_data, NULL);
g_object_watch_closure (G_OBJECT (alive_object), closure); g_object_watch_closure (G_OBJECT (alive_object), closure);
g_signal_connect_closure (object, g_signal_connect_closure (object,
g_signal_lookup (signal, G_OBJECT_TYPE (object)), g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0,
closure, closure,
FALSE); FALSE);
} }
@ -144,7 +144,7 @@ gtk_signal_connect_full (GtkObject *object,
g_return_val_if_fail (unsupported == NULL, 0); g_return_val_if_fail (unsupported == NULL, 0);
return g_signal_connect_closure (object, return g_signal_connect_closure (object,
g_signal_lookup (name, G_OBJECT_TYPE (object)), g_signal_lookup (name, G_OBJECT_TYPE (object)), 0,
(object_signal (object_signal
? g_cclosure_new_swap ? g_cclosure_new_swap
: g_cclosure_new) (func, : g_cclosure_new) (func,
@ -164,7 +164,7 @@ gtk_signal_compat_matched (GtkObject *object,
g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (GTK_IS_OBJECT (object));
id = g_signal_handler_find (object, match, 0, NULL, func, data); id = g_signal_handler_find (object, match, 0, 0, NULL, func, data);
if (!id) if (!id)
g_warning ("unable to find signal handler for object(%p) with func(%p) and data(%p)", g_warning ("unable to find signal handler for object(%p) with func(%p) and data(%p)",
@ -333,7 +333,7 @@ gtk_signal_emitv (GtkObject *object,
if (query.return_type != G_TYPE_NONE) if (query.return_type != G_TYPE_NONE)
g_value_init (&rvalue, query.return_type); g_value_init (&rvalue, query.return_type);
g_signal_emitv (params, signal_id, &rvalue); g_signal_emitv (params, signal_id, 0, &rvalue);
if (query.return_type != G_TYPE_NONE) if (query.return_type != G_TYPE_NONE)
{ {

6
gtk/gtksignal.h
View File

@ -47,7 +47,7 @@ extern "C" {
#define gtk_signal_init() g_type_init() #define gtk_signal_init() g_type_init()
#define gtk_signal_lookup g_signal_lookup #define gtk_signal_lookup g_signal_lookup
#define gtk_signal_name g_signal_name #define gtk_signal_name g_signal_name
#define gtk_signal_emit_stop g_signal_stop_emission #define gtk_signal_emit_stop(i,s) g_signal_stop_emission ((i), (s), 0)
#define gtk_signal_connect(o,s,f,d) gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 0, 0) #define gtk_signal_connect(o,s,f,d) gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 0, 0)
#define gtk_signal_connect_after(o,s,f,d) gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 0, 1) #define gtk_signal_connect_after(o,s,f,d) gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 0, 1)
#define gtk_signal_connect_object(o,s,f,d) gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 1, 0) #define gtk_signal_connect_object(o,s,f,d) gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 1, 0)
@ -64,12 +64,12 @@ extern "C" {
#define gtk_signal_handler_unblock_by_func(o,f,d) gtk_signal_compat_matched ((o), (f), (d), G_SIGNAL_MATCH_FUNC | \ #define gtk_signal_handler_unblock_by_func(o,f,d) gtk_signal_compat_matched ((o), (f), (d), G_SIGNAL_MATCH_FUNC | \
G_SIGNAL_MATCH_DATA, 2) G_SIGNAL_MATCH_DATA, 2)
#define gtk_signal_handler_unblock_by_data(o,d) gtk_signal_compat_matched ((o), 0, (d), G_SIGNAL_MATCH_DATA, 2) #define gtk_signal_handler_unblock_by_data(o,d) gtk_signal_compat_matched ((o), 0, (d), G_SIGNAL_MATCH_DATA, 2)
#define gtk_signal_handler_pending g_signal_has_handler_pending #define gtk_signal_handler_pending(i,s,b) g_signal_has_handler_pending ((i), 0, (s), (b))
#define gtk_signal_handler_pending_by_func(o,s,b,f,d) (g_signal_handler_find ((o), G_SIGNAL_MATCH_ID | \ #define gtk_signal_handler_pending_by_func(o,s,b,f,d) (g_signal_handler_find ((o), G_SIGNAL_MATCH_ID | \
G_SIGNAL_MATCH_FUNC | \ G_SIGNAL_MATCH_FUNC | \
G_SIGNAL_MATCH_DATA | \ G_SIGNAL_MATCH_DATA | \
((b) ? 0 : G_SIGNAL_MATCH_UNBLOCKED), \ ((b) ? 0 : G_SIGNAL_MATCH_UNBLOCKED), \
(s), 0, (f), (d)) != 0) (s), 0, 0, (f), (d)) != 0)
/* --- compat functions --- */ /* --- compat functions --- */