diff options
Diffstat (limited to 'gtk/gtksignal.h')
-rw-r--r-- | gtk/gtksignal.h | 193 |
1 files changed, 97 insertions, 96 deletions
diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h index dd0c3eb1d8..571ca3c261 100644 --- a/gtk/gtksignal.h +++ b/gtk/gtksignal.h @@ -8,7 +8,7 @@ * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public @@ -28,27 +28,28 @@ extern "C" { #endif /* __cplusplus */ - + #ifdef offsetof #define GTK_SIGNAL_OFFSET(t, f) ((int) offsetof (t, f)) #else /* offsetof */ #define GTK_SIGNAL_OFFSET(t, f) ((int) ((char*) &((t*) 0)->f)) #endif /* offsetof */ - -typedef void (*GtkSignalMarshal) (GtkObject *object, - gpointer data, - gint nparams, - GtkArg *args, - GtkType *arg_types, - GtkType return_type); -typedef void (*GtkSignalDestroy) (gpointer data); + +typedef void (*GtkSignalMarshal) (GtkObject *object, + gpointer data, + guint nparams, + GtkArg *args, + GtkType *arg_types, + GtkType return_type); +typedef void (*GtkSignalDestroy) (gpointer data); typedef struct _GtkSignalQuery GtkSignalQuery; struct _GtkSignalQuery { - gint object_type; + GtkType object_type; + guint signal_id; const gchar *signal_name; gboolean is_user_signal; GtkSignalRunType run_type; @@ -57,104 +58,104 @@ struct _GtkSignalQuery const GtkType *params; }; -gint gtk_signal_new (const gchar *name, - GtkSignalRunType run_type, - gint object_type, - gint function_offset, - GtkSignalMarshaller marshaller, - GtkType return_val, - gint nparams, +guint gtk_signal_new (const gchar *name, + GtkSignalRunType run_type, + GtkType object_type, + guint function_offset, + GtkSignalMarshaller marshaller, + GtkType return_val, + guint nparams, ...); -gint gtk_signal_newv (const gchar *name, - GtkSignalRunType run_type, - gint object_type, - gint function_offset, - GtkSignalMarshaller marshaller, - GtkType return_val, - gint nparams, +guint gtk_signal_newv (const gchar *name, + GtkSignalRunType run_type, + GtkType object_type, + guint function_offset, + GtkSignalMarshaller marshaller, + GtkType return_val, + guint nparams, GtkType *params); -gint gtk_signal_lookup (const gchar *name, - gint object_type); -gchar* gtk_signal_name (gint signal_num); -void gtk_signal_emit (GtkObject *object, - gint signal_type, +guint gtk_signal_lookup (const gchar *name, + GtkType object_type); +gchar* gtk_signal_name (guint signal_id); +void gtk_signal_emit (GtkObject *object, + guint signal_id, ...); -void gtk_signal_emit_by_name (GtkObject *object, - const gchar *name, +void gtk_signal_emit_by_name (GtkObject *object, + const gchar *name, ...); -void gtk_signal_emit_stop (GtkObject *object, - gint signal_type); -void gtk_signal_emit_stop_by_name (GtkObject *object, - const gchar *name); -gint gtk_signal_connect (GtkObject *object, - const gchar *name, - GtkSignalFunc func, - gpointer func_data); -gint gtk_signal_connect_after (GtkObject *object, - const gchar *name, - GtkSignalFunc func, - gpointer func_data); -gint gtk_signal_connect_object (GtkObject *object, - const gchar *name, - GtkSignalFunc func, - GtkObject *slot_object); -gint gtk_signal_connect_object_after (GtkObject *object, - const gchar *name, - GtkSignalFunc func, - GtkObject *slot_object); -gint gtk_signal_connect_full (GtkObject *object, - gchar *name, - GtkSignalFunc func, - GtkCallbackMarshal marshal, - gpointer data, - GtkDestroyNotify destroy_func, - gint object_signal, - gint after); -gint gtk_signal_connect_interp (GtkObject *object, - gchar *name, - GtkCallbackMarshal func, - gpointer data, - GtkDestroyNotify destroy_func, - gint after); - -void gtk_signal_connect_object_while_alive (GtkObject *object, +void gtk_signal_emit_stop (GtkObject *object, + guint signal_id); +void gtk_signal_emit_stop_by_name (GtkObject *object, + const gchar *name); +guint gtk_signal_connect (GtkObject *object, + const gchar *name, + GtkSignalFunc func, + gpointer func_data); +guint gtk_signal_connect_after (GtkObject *object, + const gchar *name, + GtkSignalFunc func, + gpointer func_data); +guint gtk_signal_connect_object (GtkObject *object, + const gchar *name, + GtkSignalFunc func, + GtkObject *slot_object); +guint gtk_signal_connect_object_after (GtkObject *object, + const gchar *name, + GtkSignalFunc func, + GtkObject *slot_object); +guint gtk_signal_connect_full (GtkObject *object, + const gchar *name, + GtkSignalFunc func, + GtkCallbackMarshal marshal, + gpointer data, + GtkDestroyNotify destroy_func, + gint object_signal, + gint after); +guint gtk_signal_connect_interp (GtkObject *object, + const gchar *name, + GtkCallbackMarshal func, + gpointer data, + GtkDestroyNotify destroy_func, + gint after); + +void gtk_signal_connect_object_while_alive (GtkObject *object, const gchar *signal, - GtkSignalFunc func, - GtkObject *alive_object); -void gtk_signal_connect_while_alive (GtkObject *object, + GtkSignalFunc func, + GtkObject *alive_object); +void gtk_signal_connect_while_alive (GtkObject *object, const gchar *signal, - GtkSignalFunc func, - gpointer func_data, - GtkObject *alive_object); - -void gtk_signal_disconnect (GtkObject *object, - gint anid); -void gtk_signal_disconnect_by_data (GtkObject *object, - gpointer data); -void gtk_signal_handler_block (GtkObject *object, - gint anid); -void gtk_signal_handler_block_by_data (GtkObject *object, - gpointer data); -void gtk_signal_handler_unblock (GtkObject *object, - gint anid); -void gtk_signal_handler_unblock_by_data (GtkObject *object, - gpointer data); + GtkSignalFunc func, + gpointer func_data, + GtkObject *alive_object); + +void gtk_signal_disconnect (GtkObject *object, + guint handler_id); +void gtk_signal_disconnect_by_data (GtkObject *object, + gpointer data); +void gtk_signal_handler_block (GtkObject *object, + guint handler_id); +void gtk_signal_handler_block_by_data (GtkObject *object, + gpointer data); +void gtk_signal_handler_unblock (GtkObject *object, + guint handler_id); +void gtk_signal_handler_unblock_by_data (GtkObject *object, + gpointer data); guint gtk_signal_handler_pending (GtkObject *object, - gint signal_type, + guint signal_id, gboolean may_be_blocked); -void gtk_signal_handlers_destroy (GtkObject *object); -void gtk_signal_default_marshaller (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args); -void gtk_signal_set_funcs (GtkSignalMarshal marshal_func, - GtkSignalDestroy destroy_func); +void gtk_signal_handlers_destroy (GtkObject *object); +void gtk_signal_default_marshaller (GtkObject *object, + GtkSignalFunc func, + gpointer func_data, + GtkArg *args); +void gtk_signal_set_funcs (GtkSignalMarshal marshal_func, + GtkSignalDestroy destroy_func); /* Report internal information about a signal. The caller has the response * to invoke a supsequent g_free (returned_data); but must leave the * contents of GtkSignalQuery untouched. */ -GtkSignalQuery* gtk_signal_query (gint signal_num); +GtkSignalQuery* gtk_signal_query (guint signal_id); #ifdef __cplusplus |