Use clutter_event_get_* instead of ShellGlobal
Before Clutter gained accessors for event information, we had shell_global_ functions. Now that Clutter has them, use them and delete the ShellGlobal code. http://bugzilla.gnome.org/show_bug.cgi?id=594561
This commit is contained in:
@ -295,47 +295,6 @@ shell_clutter_texture_set_from_pixbuf (ClutterTexture *texture,
|
||||
0, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* shell_get_event_key_symbol:
|
||||
*
|
||||
* Return value: Clutter key value for the key press and release events,
|
||||
* as specified in clutter-keysyms.h
|
||||
*/
|
||||
guint16
|
||||
shell_get_event_key_symbol(ClutterEvent *event)
|
||||
{
|
||||
g_return_val_if_fail(event->type == CLUTTER_KEY_PRESS ||
|
||||
event->type == CLUTTER_KEY_RELEASE, 0);
|
||||
|
||||
return event->key.keyval;
|
||||
}
|
||||
|
||||
/**
|
||||
* shell_get_button_event_click_count:
|
||||
*
|
||||
* Return value: click count for button press and release events
|
||||
*/
|
||||
guint16
|
||||
shell_get_button_event_click_count(ClutterEvent *event)
|
||||
{
|
||||
g_return_val_if_fail(event->type == CLUTTER_BUTTON_PRESS ||
|
||||
event->type == CLUTTER_BUTTON_RELEASE, 0);
|
||||
return event->button.click_count;
|
||||
}
|
||||
|
||||
/**
|
||||
* shell_get_event_related:
|
||||
*
|
||||
* Return value: (transfer none): related actor
|
||||
*/
|
||||
ClutterActor *
|
||||
shell_get_event_related (ClutterEvent *event)
|
||||
{
|
||||
g_return_val_if_fail (event->type == CLUTTER_ENTER ||
|
||||
event->type == CLUTTER_LEAVE, NULL);
|
||||
return event->crossing.related;
|
||||
}
|
||||
|
||||
/**
|
||||
* shell_global_get:
|
||||
*
|
||||
|
@ -36,10 +36,6 @@ GType shell_global_get_type (void) G_GNUC_CONST;
|
||||
gboolean shell_clutter_texture_set_from_pixbuf (ClutterTexture *texture,
|
||||
GdkPixbuf *pixbuf);
|
||||
|
||||
guint16 shell_get_event_key_symbol(ClutterEvent *event);
|
||||
|
||||
guint16 shell_get_button_event_click_count(ClutterEvent *event);
|
||||
|
||||
ClutterActor *shell_get_event_related(ClutterEvent *event);
|
||||
|
||||
ShellGlobal *shell_global_get (void);
|
||||
|
Reference in New Issue
Block a user