diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-26 20:32:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-26 20:32:30 +0000 |
| commit | 564cbf8516604f18cb2d4c2f9417e6ff7e2933d7 (patch) | |
| tree | a4ab444b301020245ead15c8a556992561b21e5f | |
| parent | 648204c8bc6a2cd0c345cc6cbf4dbaf6f400917e (diff) | |
Add explicit cast of G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA to
Tue Mar 26 15:21:47 2002 Owen Taylor <otaylor@redhat.com>
* gsignal.h (g_signal_handlers_*_by_func): Add explicit
cast of G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA to
GSignalMatchType so that these macros work for C++.
(#76454, Damien Sandras)
| -rw-r--r-- | gobject/ChangeLog | 7 | ||||
| -rw-r--r-- | gobject/gsignal.h | 19 |
2 files changed, 18 insertions, 8 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 26ecc8a9a..2f79d008b 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,10 @@ +Tue Mar 26 15:21:47 2002 Owen Taylor <otaylor@redhat.com> + + * gsignal.h (g_signal_handlers_*_by_func): Add explicit + cast of G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA to + GSignalMatchType so that these macros work for C++. + (#76454, Damien Sandras) + Mon Mar 25 17:51:05 2002 Owen Taylor <otaylor@redhat.com> * glib-mkenums.in (parse_entries): Fix various bugs and diff --git a/gobject/gsignal.h b/gobject/gsignal.h index 1cc6b10d9..f187f4017 100644 --- a/gobject/gsignal.h +++ b/gobject/gsignal.h @@ -242,15 +242,18 @@ void g_signal_chain_from_overridden (const GValue *instance_and_param g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_AFTER) #define g_signal_connect_swapped(instance, detailed_signal, c_handler, data) \ g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_SWAPPED) -#define g_signal_handlers_disconnect_by_func(instance, func, data) \ - g_signal_handlers_disconnect_matched ((instance), G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, \ +#define g_signal_handlers_disconnect_by_func(instance, func, data) \ + g_signal_handlers_disconnect_matched ((instance), \ + (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA), \ 0, 0, NULL, (func), (data)) -#define g_signal_handlers_block_by_func(instance, func, data) \ - g_signal_handlers_block_matched ((instance), G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, \ - 0, 0, NULL, (func), (data)) -#define g_signal_handlers_unblock_by_func(instance, func, data) \ - g_signal_handlers_unblock_matched ((instance), G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, \ - 0, 0, NULL, (func), (data)) +#define g_signal_handlers_block_by_func(instance, func, data) \ + g_signal_handlers_block_matched ((instance), \ + (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA), \ + 0, 0, NULL, (func), (data)) +#define g_signal_handlers_unblock_by_func(instance, func, data) \ + g_signal_handlers_unblock_matched ((instance), \ + (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA), \ + 0, 0, NULL, (func), (data)) /*< private >*/ |