diff options
author | Michael Natterer <mitch@gimp.org> | 2010-11-24 20:28:19 +0100 |
---|---|---|
committer | Michael Natterer <mitch@gimp.org> | 2010-11-24 20:28:19 +0100 |
commit | aaf853017768fcae8440394d9504621a264bcdc4 (patch) | |
tree | d876531655a6d716b0eb419f2fc305b2fbbc79a7 /gdk | |
parent | bdf18500ec6a679c33338f29305e2190ba5533d9 (diff) | |
download | gtk+-aaf853017768fcae8440394d9504621a264bcdc4.tar.gz |
gdk: remove GdkDeviceKey and GdkDeviceAxis from the public API
move GdkDeviceKey to gdkdevice.c because it's still used there, remove
GdkDeviceAxis entirely.
Diffstat (limited to 'gdk')
-rw-r--r-- | gdk/gdkdevice.c | 8 | ||||
-rw-r--r-- | gdk/gdkdevice.h | 34 |
2 files changed, 8 insertions, 34 deletions
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index e655d7c5d8..c8e37795f0 100644 --- 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 e40f17f804..27375f7621 100644 --- 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. */ |