[gtk+] gdk: remove GdkDeviceKey and GdkDeviceAxis from the public API
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: remove GdkDeviceKey and GdkDeviceAxis from the public API
- Date: Wed, 24 Nov 2010 19:29:16 +0000 (UTC)
commit aaf853017768fcae8440394d9504621a264bcdc4
Author: Michael Natterer <mitch gimp org>
Date: Wed Nov 24 20:28:19 2010 +0100
gdk: remove GdkDeviceKey and GdkDeviceAxis from the public API
move GdkDeviceKey to gdkdevice.c because it's still used there, remove
GdkDeviceAxis entirely.
gdk/gdkdevice.c | 8 ++++++++
gdk/gdkdevice.h | 34 ----------------------------------
2 files changed, 8 insertions(+), 34 deletions(-)
---
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index e655d7c..c8e3779 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 e40f17f..27375f7 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.
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]