diff --git a/configure.ac b/configure.ac index d84ea9f8a..0335446da 100644 --- a/configure.ac +++ b/configure.ac @@ -233,7 +233,6 @@ atk/atk-sharp.dll.config atk/glue/Makefile gdk/Makefile gdk/gdk-sharp.dll.config -gdk/glue/Makefile gtk/Makefile gtk/gtk-sharp-3.0.pc gtk/gtk-sharp.dll.config diff --git a/gdk/Device.custom b/gdk/Device.custom index f67891980..14de14cb3 100644 --- a/gdk/Device.custom +++ b/gdk/Device.custom @@ -19,26 +19,6 @@ // Boston, MA 02111-1307, USA. - [DllImport("gdksharpglue-3")] - static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis); - - [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void gdk_device_get_state(IntPtr device, IntPtr window, double [] axes, out int maskAsInt); - - -#if FIXME30 - public void GetState(Gdk.Window window, out double [] axes, out Gdk.ModifierType mask) { - int maskAsInt; - axes = new double [this.NumAxes]; - gdk_device_get_state(Handle, window.Handle, axes, out maskAsInt); - mask = (Gdk.ModifierType) maskAsInt; - } -#endif - - public Gdk.DeviceKey GetDeviceKey (uint axis) { - return gtksharp_gdk_device_get_device_key (Handle, axis); - } - [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_device_free_history(IntPtr events, int n_events); diff --git a/gdk/glue/Makefile.am b/gdk/glue/Makefile.am deleted file mode 100644 index 14e5ce971..000000000 --- a/gdk/glue/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -lib_LTLIBRARIES = libgdksharpglue-3.la - -libgdksharpglue_3_la_SOURCES = \ - device.c \ - vmglueheaders.h - -nodist_libgdksharpglue_3_la_SOURCES = generated.c - -# Adding a new glue file? - -libgdksharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined - -libgdksharpglue_3_la_LIBADD = $(GTK_LIBS) - -INCLUDES = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) - -libgdksharpglue.dll: $(libgdksharpglue_3_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def - ./build-dll libgdksharpglue-3 $(VERSION) - -CLEANFILES = lib*.a lib*.dll - -EXTRA_DIST = win32dll.c diff --git a/gdk/glue/device.c b/gdk/glue/device.c deleted file mode 100644 index b3de6635c..000000000 --- a/gdk/glue/device.c +++ /dev/null @@ -1,40 +0,0 @@ -/* device.c : Glue to access fields in GdkDevice. - * - * Author: Manuel V. Santos - * - * Copyright (c) Manuel V. Santos - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the Lesser GNU General - * Public License as published by the Free Software Foundation. - * - * This program 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 program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - - -#include - -/* Forward declarations */ -GdkDeviceAxis gtksharp_gdk_device_get_device_axis (GdkDevice *device, guint i); -GdkDeviceKey gtksharp_gdk_device_get_device_key (GdkDevice *device, guint i); - -GdkDeviceAxis -gtksharp_gdk_device_get_device_axis (GdkDevice *device, guint i) -{ - return device->axes[i]; -} - -GdkDeviceKey -gtksharp_gdk_device_get_device_key (GdkDevice *device, guint i) -{ - return device->keys[i]; -} - diff --git a/gdk/glue/vmglueheaders.h b/gdk/glue/vmglueheaders.h deleted file mode 100644 index f935e44b3..000000000 --- a/gdk/glue/vmglueheaders.h +++ /dev/null @@ -1,4 +0,0 @@ -/* Headers for virtual method glue compilation */ - -#include - diff --git a/gdk/glue/win32dll.c b/gdk/glue/win32dll.c deleted file mode 100755 index a57c07683..000000000 --- a/gdk/glue/win32dll.c +++ /dev/null @@ -1,16 +0,0 @@ -#define WIN32_LEAN_AND_MEAN -#include -#undef WIN32_LEAN_AND_MEAN -#include - -BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -{ - return TRUE; -} - -/* -BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved) -{ - return TRUE; -} -*/