gdk: remove GdkDeviceKey and GdkDeviceAxis from the public API

move GdkDeviceKey to gdkdevice.c because it's still used there, remove
GdkDeviceAxis entirely.

diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index e655d7c5d82dee0c247af60b2eb60993f87dbf0b..c8e37795f01811f370e61440d74c627f46586f8e 100644 (file)
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -26,6 +26,14 @@
 #include "gdkinternals.h"
 
 
+typedef struct _GdkDeviceKey GdkDeviceKey;
+
+struct _GdkDeviceKey
+{
+  guint keyval;
+  GdkModifierType modifiers;
+};
+
 typedef struct _GdkAxisInfo GdkAxisInfo;
 
 struct _GdkAxisInfo

diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index e40f17f804c5a8fe58ae137b95e7a1c6f95fdc5c..27375f7621579bf21f5db94e1197bc91d37cd006 100644 (file)
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -35,9 +35,6 @@ G_BEGIN_DECLS
 
 typedef struct _GdkDevice GdkDevice;
 typedef struct _GdkDevicePrivate GdkDevicePrivate;
-
-typedef struct _GdkDeviceKey GdkDeviceKey;
-typedef struct _GdkDeviceAxis GdkDeviceAxis;
 typedef struct _GdkTimeCoord GdkTimeCoord;
 
 /**
@@ -141,37 +138,6 @@ typedef enum {
   GDK_DEVICE_TYPE_FLOATING
 } GdkDeviceType;
 
-/**
- * GdkDeviceKey:
- * @keyval: the keyval to generate when the macro button is pressed.
- *          If this is 0, no keypress will be generated.
- * @modifiers: the modifiers set for the generated key event.
- *
- * The <structname>GdkDeviceKey</structname> structure contains information
- * about the mapping of one device macro button onto a normal X key event.
- */
-struct _GdkDeviceKey
-{
-  guint keyval;
-  GdkModifierType modifiers;
-};
-
-/**
- * GdkDeviceAxis:
- * @use: specifies how the axis is used.
- * @min: the minimal value that will be reported by this axis.
- * @max: the maximal value that will be reported by this axis.
- *
- * The <structname>GdkDeviceAxis</structname> structure contains information
- * about the range and mapping of a device axis.
- */
-struct _GdkDeviceAxis
-{
-  GdkAxisUse use;
-  gdouble    min;
-  gdouble    max;
-};
-
 /* We don't allocate each coordinate this big, but we use it to
  * be ANSI compliant and avoid accessing past the defined limits.
  */