Fix compiler warnings about unused variables

This commit is contained in:
Matthias Clasen 2011-01-30 01:50:58 -05:00
parent 0c2e16f04b
commit 5caa76c5df

View File

@ -10835,25 +10835,23 @@ _gtk_widget_peek_request_cache (GtkWidget *widget)
/* /*
* _gtk_widget_set_device_window: * _gtk_widget_set_device_window:
* @widget: a #GtkWidget. * @widget: a #GtkWidget
* @device: a #GdkDevice. * @device: a #GdkDevice
* @window: the new device window. * @window: the new device window
* *
* Sets pointer window for @widget and @device. Does not ref @window. * Sets pointer window for @widget and @device.
* Does not ref @window.
*/ */
void void
_gtk_widget_set_device_window (GtkWidget *widget, _gtk_widget_set_device_window (GtkWidget *widget,
GdkDevice *device, GdkDevice *device,
GdkWindow *window) GdkWindow *window)
{ {
GtkWidgetPrivate *priv;
GHashTable *device_window; GHashTable *device_window;
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GDK_IS_DEVICE (device)); g_return_if_fail (GDK_IS_DEVICE (device));
g_return_if_fail (!window || GDK_IS_WINDOW (window)); g_return_if_fail (window == NULL || GDK_IS_WINDOW (window));
priv = widget->priv;
if (!gtk_widget_get_mapped (widget)) if (!gtk_widget_get_mapped (widget))
return; return;
@ -10882,24 +10880,20 @@ _gtk_widget_set_device_window (GtkWidget *widget,
/* /*
* _gtk_widget_get_device_window: * _gtk_widget_get_device_window:
* @widget: a #GtkWidget. * @widget: a #GtkWidget
* @device: a #GdkDevice. * @device: a #GdkDevice
* *
* Return value: the device window set on the #GdkScreen @widget is attached * Return value: the device window set on @widget, or %NULL
* to, or %NULL.
*/ */
GdkWindow * GdkWindow *
_gtk_widget_get_device_window (GtkWidget *widget, _gtk_widget_get_device_window (GtkWidget *widget,
GdkDevice *device) GdkDevice *device)
{ {
GtkWidgetPrivate *priv;
GHashTable *device_window; GHashTable *device_window;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
g_return_val_if_fail (GDK_IS_DEVICE (device), NULL); g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
priv = widget->priv;
if (!gtk_widget_get_mapped (widget)) if (!gtk_widget_get_mapped (widget))
return NULL; return NULL;
@ -10913,16 +10907,16 @@ _gtk_widget_get_device_window (GtkWidget *widget,
/* /*
* _gtk_widget_list_devices: * _gtk_widget_list_devices:
* @widget: a #GtkWidget. * @widget: a #GtkWidget
* *
* Returns the list of #GdkDevices that is currently on top of any widget #GdkWindow. * Returns the list of #GdkDevices that is currently on top
* Free the list with g_list_free(), the elements are owned by GTK+ and must not * of any window belonging to @widget.
* be freed. * Free the list with g_list_free(), the elements are owned
* by GTK+ and must not be freed.
*/ */
GList * GList *
_gtk_widget_list_devices (GtkWidget *widget) _gtk_widget_list_devices (GtkWidget *widget)
{ {
GtkWidgetPrivate *priv;
GHashTableIter iter; GHashTableIter iter;
GHashTable *device_window; GHashTable *device_window;
GList *devices = NULL; GList *devices = NULL;
@ -10930,8 +10924,6 @@ _gtk_widget_list_devices (GtkWidget *widget)
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
priv = widget->priv;
if (!gtk_widget_get_mapped (widget)) if (!gtk_widget_get_mapped (widget))
return NULL; return NULL;