Remove. (gdk_device_get_type): Drop class init function. The X11 version

2007-02-19  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkinput.c
	(gdk_device_finalize, gdk_device_class_init): Remove.
	(gdk_device_get_type): Drop class init function. The X11 version
	doesn't have one either.
	(gdk_devices_list): Call gdk_display_list_devices() on _gdk_display.
	(gdk_display_list_devices): Check that the argument is
	_gdk_display.

	* gdk/win32/gdkinput-win32.h (GdkAxisInfo, GdkDevicePrivate):
	Cleanup: remove unused fields.
	* gdk/win32/gdkinput-win32.c: Corresponding changes. Fix function
	names in a few debugging printouts.


svn path=/trunk/; revision=17332

1 files changed, 16 insertions, 27 deletions

diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c
index 61a2aa7086..4ec504a8d5 100644
--- a/gdk/win32/gdkinput.c
+++ b/gdk/win32/gdkinput.c
@@ -35,8 +35,8 @@
 
 #include "gdkdisplay.h"
 #include "gdkinput.h"
-#include "gdkprivate.h"
 
+#include "gdkprivate-win32.h"
 #include "gdkinput-win32.h"
 
 static GdkDeviceAxis gdk_input_core_axes[] = {
@@ -66,18 +66,6 @@ _gdk_init_input_core (GdkDisplay *display)
   display->core_pointer->keys = NULL;
 }
 
-static void
-gdk_device_finalize (GObject *object)
-{
-  g_error ("A GdkDevice object was finalized. This should not happen");
-}
-
-static void
-gdk_device_class_init (GObjectClass *class)
-{
-  class->finalize = gdk_device_finalize;
-}
-
 GType
 gdk_device_get_type (void)
 {
@@ -86,20 +74,20 @@ gdk_device_get_type (void)
   if (!object_type)
     {
       static const GTypeInfo object_info =
-      {
-        sizeof (GdkDeviceClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) gdk_device_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (GdkDevicePrivate),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) NULL,
-      };
+	{
+	  sizeof (GdkDeviceClass),
+	  (GBaseInitFunc) NULL,
+	  (GBaseFinalizeFunc) NULL,
+	  (GClassInitFunc) NULL,
+	  NULL,			/* class_finalize */
+	  NULL,			/* class_data */
+	  sizeof (GdkDevicePrivate),
+	  0,			/* n_preallocs */
+	  (GInstanceInitFunc) NULL,
+	};
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkDevice",
+                                            g_intern_static_string ("GdkDevice"),
                                             &object_info, 0);
     }
   
@@ -109,13 +97,14 @@ gdk_device_get_type (void)
 GList *
 gdk_devices_list (void)
 {
-  _gdk_input_wintab_init_check ();
-  return _gdk_input_devices;
+  return gdk_display_list_devices (_gdk_display);
 }
 
 GList *
 gdk_display_list_devices (GdkDisplay *dpy)
 {
+  g_return_val_if_fail (dpy == _gdk_display, NULL);
+
   _gdk_input_wintab_init_check ();
   return _gdk_input_devices;
 }