Merges from gtk-1-2

[~andy/gtk] / gdk / x11 / gdkinput-none.c

diff --git a/gdk/x11/gdkinput-none.c b/gdk/x11/gdkinput-none.c
index 8ae8c4189ae8ce60558dea7727641b0f2417827f..d3aba3dd93f3cce8649dc7cd09e17505d678af69 100644 (file)
--- a/gdk/x11/gdkinput-none.c
+++ b/gdk/x11/gdkinput-none.c
@@ -12,11 +12,19 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
-#ifdef XINPUT_NONE
+#include "gdkinputprivate.h"
+
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
 
 static void gdk_input_none_get_pointer (GdkWindow       *window,
                                        guint32   deviceid,
@@ -28,10 +36,11 @@ static void gdk_input_none_get_pointer (GdkWindow       *window,
                                        GdkModifierType *mask);
 
 void
-gdk_input_init ()
+gdk_input_init (void)
 {
   gdk_input_vtable.set_mode           = NULL;
   gdk_input_vtable.set_axes           = NULL;
+  gdk_input_vtable.set_key            = NULL;
   gdk_input_vtable.motion_events      = NULL;
   gdk_input_vtable.get_pointer        = gdk_input_none_get_pointer;
   gdk_input_vtable.grab_pointer       = NULL;
@@ -43,7 +52,7 @@ gdk_input_init ()
   gdk_input_vtable.enable_window      = NULL;
   gdk_input_vtable.disable_window     = NULL;
 
-  gdk_input_devices = g_list_append (NULL, &gdk_input_core_info);
+  gdk_input_devices = g_list_append (NULL, (GdkDeviceInfo *) &gdk_input_core_info);
 
   gdk_input_ignore_core = FALSE;
 }
@@ -68,5 +77,3 @@ gdk_input_none_get_pointer (GdkWindow       *window,
   if (xtilt) *xtilt = 0;
   if (ytilt) *ytilt = 0;
 }
-
-#endif /* XINPUT_NONE */