Use G_STRLOC instead __FILE__ and __LINE__

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

diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h
index d2fa666e5467aa7d9851bacb73ba56a237d8ff94..454def8f2b74dfbdc58470c50ff975329e4452da 100644 (file)
--- a/gdk/gdkinput.h
+++ b/gdk/gdkinput.h
@@ -1,15 +1,51 @@
+/* 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))
+#define GDK_DEVICE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DEVICE, GdkDeviceClass))
+#define GDK_IS_DEVICE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DEVICE))
+#define GDK_IS_DEVICE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DEVICE))
+#define GDK_DEVICE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DEVICE, GdkDeviceClass))
 
 typedef struct _GdkDeviceKey       GdkDeviceKey;
 typedef struct _GdkDeviceAxis      GdkDeviceAxis;
 typedef struct _GdkDevice          GdkDevice;
+typedef struct _GdkDeviceClass     GdkDeviceClass;
 typedef struct _GdkTimeCoord       GdkTimeCoord;
 
 typedef enum
@@ -61,6 +97,7 @@ struct _GdkDeviceAxis
 
 struct _GdkDevice
 {
+  GObject parent_instance;
   /* All fields are read-only */
          
   gchar *name;
@@ -86,8 +123,12 @@ struct _GdkTimeCoord
   gdouble axes[GDK_MAX_TIMECOORD_AXES];
 };
 
+GType          gdk_device_get_type      (void) G_GNUC_CONST;
+
+#ifndef GDK_MULTIHEAD_SAFE
 /* Returns a list of GdkDevice * */      
-GList *        gdk_devices_list         (void);
+GList *        gdk_devices_list              (void);
+#endif /* GDK_MULTIHEAD_SAFE */
 
 /* Functions to configure a device */
 void           gdk_device_set_source    (GdkDevice      *device,
@@ -97,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,
@@ -125,10 +166,10 @@ void gdk_input_set_extension_events (GdkWindow        *window,
                                     gint              mask,
                                     GdkExtensionMode  mode);
 
-GDKVAR GdkDevice *gdk_core_pointer;
+#ifndef GDK_MULTIHEAD_SAFE
+GdkDevice *gdk_device_get_core_pointer (void);
+#endif
  
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_INPUT_H__ */