diff --git a/clutter/clutter-device-manager.c b/clutter/clutter-device-manager.c index 11d76a103..42ce823e4 100644 --- a/clutter/clutter-device-manager.c +++ b/clutter/clutter-device-manager.c @@ -231,7 +231,7 @@ _clutter_device_manager_add_device (ClutterDeviceManager *device_manager, } /* - * _clutter_device_manager_remobe_device: + * _clutter_device_manager_remove_device: * @device_manager: a #ClutterDeviceManager * @device: a #ClutterInputDevice * diff --git a/clutter/clutter-device-manager.h b/clutter/clutter-device-manager.h index 66df18932..e46850e26 100644 --- a/clutter/clutter-device-manager.h +++ b/clutter/clutter-device-manager.h @@ -45,7 +45,7 @@ G_BEGIN_DECLS */ typedef struct _ClutterDeviceManager ClutterDeviceManager; -GType clutter_stage_manager_get_type (void) G_GNUC_CONST; +GType clutter_device_manager_get_type (void) G_GNUC_CONST; ClutterDeviceManager *clutter_device_manager_get_default (void); GSList * clutter_device_manager_list_devices (ClutterDeviceManager *device_manager); diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 644d20ed6..84cf2dc7a 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -2897,9 +2897,9 @@ clutter_get_font_flags (void) /** * clutter_get_input_device_for_id: - * @id: a device id + * @id: the unique id for a device * - * Retrieves the #ClutterInputDevice from its id. This is a convenience + * Retrieves the #ClutterInputDevice from its @id. This is a convenience * wrapper for clutter_device_manager_get_device() and it is functionally * equivalent to: * diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt index 132770d63..7cad61ed7 100644 --- a/doc/reference/clutter/clutter-sections.txt +++ b/doc/reference/clutter/clutter-sections.txt @@ -404,6 +404,7 @@ clutter_actor_create_pango_layout clutter_actor_is_in_clone_paint clutter_actor_set_text_direction clutter_actor_get_text_direction +clutter_actor_has_pointer ClutterActorBox @@ -977,13 +978,9 @@ clutter_event_get_related clutter_event_get_scroll_direction -ClutterInputDeviceType clutter_event_get_device clutter_event_get_device_id clutter_event_get_device_type -clutter_get_input_device_for_id -clutter_input_device_get_device_id -clutter_input_device_get_device_type clutter_get_current_event_time @@ -996,6 +993,50 @@ ClutterAnyEvent clutter_event_get_type +
+clutter-input-device +ClutterInputDevice +ClutterInputDeviceType +ClutterInputDevice +ClutterInputDeviceClass +clutter_get_input_device_for_id +clutter_input_device_get_device_id +clutter_input_device_get_device_type +clutter_input_device_get_device_coords + + +CLUTTER_TYPE_INPUT_DEVICE +CLUTTER_INPUT_DEVICE +CLUTTER_INPUT_DEVICE_CLASS +CLUTTER_IS_INPUT_DEVICE +CLUTTER_IS_INPUT_DEVICE_CLASS +CLUTTER_INPUT_DEVICE_GET_CLASS + + +clutter_input_device_get_type +
+ +
+clutter-device-manager +ClutterDeviceManager +ClutterDeviceManager +clutter_device_manager_get_default +clutter_device_manager_list_devices +clutter_device_manager_peek_devices +clutter_device_manager_get_device + + +clutter_get_input_device_for_id + + +CLUTTER_TYPE_DEVICE_MANAGER +CLUTTER_DEVICE_MANAGER +CLUTTER_IS_DEVICE_MANAGER + + +clutter_device_manager_get_type +
+
clutter-main General