Use G_STRLOC instead __FILE__ and __LINE__

[~andy/gtk] / gdk / gdkinput.h

diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h
index 430a17b0017fd90aa8f2b9edd95668c7f399f82e..454def8f2b74dfbdc58470c50ff975329e4452da 100644 (file)
--- a/gdk/gdkinput.h
+++ b/gdk/gdkinput.h
@@ -1,11 +1,39 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_INPUT_H__
 #define __GDK_INPUT_H__
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GDK_TYPE_DEVICE              (gdk_device_get_type ())
 #define GDK_DEVICE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DEVICE, GdkDevice))
@@ -95,7 +123,7 @@ struct _GdkTimeCoord
   gdouble axes[GDK_MAX_TIMECOORD_AXES];
 };
 
-GType          gdk_device_get_type      (void);
+GType          gdk_device_get_type      (void) G_GNUC_CONST;
 
 #ifndef GDK_MULTIHEAD_SAFE
 /* Returns a list of GdkDevice * */      
@@ -110,12 +138,12 @@ gboolean       gdk_device_set_mode      (GdkDevice      *device,
                                         GdkInputMode    mode);
 
 void           gdk_device_set_key       (GdkDevice      *device,
-                                        guint           index,
+                                        guint           index_,
                                         guint           keyval,
                                         GdkModifierType modifiers);
 
 void     gdk_device_set_axis_use (GdkDevice         *device,
-                                 guint              index,
+                                 guint              index_,
                                  GdkAxisUse         use);
 void     gdk_device_get_state    (GdkDevice         *device,
                                  GdkWindow         *window,
@@ -142,8 +170,6 @@ void gdk_input_set_extension_events (GdkWindow        *window,
 GdkDevice *gdk_device_get_core_pointer (void);
 #endif
  
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_INPUT_H__ */