[gtk+/events-refactor: 319/1085] Hook up GdkDeviceManager to build.
- From: Carlos Garnacho <carlosg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/events-refactor: 319/1085] Hook up GdkDeviceManager to build.
- Date: Tue, 29 Sep 2009 10:44:55 +0000 (UTC)
commit 6abf0134be3266b0c7cb18f9e8eaf35708bd0969
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed May 20 01:05:04 2009 +0200
Hook up GdkDeviceManager to build.
gdk/Makefile.am | 2 ++
gdk/gdk.h | 1 +
gdk/gdkdevicemanager.c | 1 +
gdk/gdkinternals.h | 3 +++
gdk/x11/Makefile.am | 3 ++-
5 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 52a5bf0..5a7ed7d 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -67,6 +67,7 @@ gdk_public_h_sources = \
gdkcairo.h \
gdkcolor.h \
gdkcursor.h \
+ gdkdevicemanager.h \
gdkdisplay.h \
gdkdisplaymanager.h \
gdkdnd.h \
@@ -107,6 +108,7 @@ gdk_c_sources = \
gdkcairo.c \
gdkcolor.c \
gdkcursor.c \
+ gdkdevicemanager.c \
gdkdisplay.c \
gdkdisplaymanager.c \
gdkdnd.c \
diff --git a/gdk/gdk.h b/gdk/gdk.h
index d834bb1..c47a82d 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -33,6 +33,7 @@
#include <gdk/gdkcairo.h>
#include <gdk/gdkcolor.h>
#include <gdk/gdkcursor.h>
+#include <gdk/gdkdevicemanager.h>
#include <gdk/gdkdisplay.h>
#include <gdk/gdkdisplaymanager.h>
#include <gdk/gdkdnd.h>
diff --git a/gdk/gdkdevicemanager.c b/gdk/gdkdevicemanager.c
index 284fdd7..5db8a46 100644
--- a/gdk/gdkdevicemanager.c
+++ b/gdk/gdkdevicemanager.c
@@ -19,6 +19,7 @@
#include "gdkdevicemanager.h"
#include "gdkintl.h"
+#include "gdkinternals.h"
static void gdk_device_manager_set_property (GObject *object,
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 61a5433..0f04d78 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -200,6 +200,9 @@ void gdk_synthesize_window_state (GdkWindow *window,
GdkWindowState unset_flags,
GdkWindowState set_flags);
+GdkDeviceManager * _gdk_device_manager_new (GdkDisplay *display);
+
+
#define GDK_SCRATCH_IMAGE_WIDTH 256
#define GDK_SCRATCH_IMAGE_HEIGHT 64
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 5d41ec8..d5bbf0c 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -23,6 +23,7 @@ libgdk_x11_la_SOURCES = \
gdkasync.h \
gdkcolor-x11.c \
gdkcursor-x11.c \
+ gdkdevicemanager-x11.c \
gdkdisplay-x11.c \
gdkdisplay-x11.h \
gdkdnd-x11.c \
@@ -62,7 +63,7 @@ libgdk_x11_la_SOURCES = \
if XINPUT_XFREE
libgdk_x11_la_SOURCES += gdkinput-x11.c gdkinput-xfree.c
else
-libgdk_x11_la_SOURCES += gdkinput-none.c
+libgdk_x11_la_SOURCES += gdkinput-none.c gdkdevicemanager-core.c
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]