gdk/win32/gdkprivate-win32.h gdk/win32/gdkevents-win32.c

1999-12-30  Tor Lillqvist  <tml@iki.fi>

* gdk/win32/gdkprivate-win32.h
* gdk/win32/gdkevents-win32.c
* gdk/win32/gdkinput-win32.c
* gdk/win32/gdkwindow-win32.c: Remove the superfluous
extension_events field in the GdkWindowWin32Data struct. Use only
the extension_events field in GdkWindowPrivate. Previously one was
set, and the other one tested, which broke tablet functionality.

diff --git a/ChangeLog b/ChangeLog
index 4b9721f0d3d7c5e56c3c6eaea85888de04e2d2b5..4c4732824760fa59afe45467a19a22aa83037349 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,14 @@
 
        * gdk/gdk.def: Add gdk_xid_table_insert.
 
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkevents-win32.c
+       * gdk/win32/gdkinput-win32.c
+       * gdk/win32/gdkwindow-win32.c: Remove the superfluous
+       extension_events field in the GdkWindowWin32Data struct. Use only
+       the extension_events field in GdkWindowPrivate. Previously one was
+       set, and the other one tested, which broke tablet functionality.
+
 1999-12-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkfont-win32.c (gdk_text_size, gdk_text_extents):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4b9721f0d3d7c5e56c3c6eaea85888de04e2d2b5..4c4732824760fa59afe45467a19a22aa83037349 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -7,6 +7,14 @@
 
        * gdk/gdk.def: Add gdk_xid_table_insert.
 
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkevents-win32.c
+       * gdk/win32/gdkinput-win32.c
+       * gdk/win32/gdkwindow-win32.c: Remove the superfluous
+       extension_events field in the GdkWindowWin32Data struct. Use only
+       the extension_events field in GdkWindowPrivate. Previously one was
+       set, and the other one tested, which broke tablet functionality.
+
 1999-12-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkfont-win32.c (gdk_text_size, gdk_text_extents):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4b9721f0d3d7c5e56c3c6eaea85888de04e2d2b5..4c4732824760fa59afe45467a19a22aa83037349 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -7,6 +7,14 @@
 
        * gdk/gdk.def: Add gdk_xid_table_insert.
 
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkevents-win32.c
+       * gdk/win32/gdkinput-win32.c
+       * gdk/win32/gdkwindow-win32.c: Remove the superfluous
+       extension_events field in the GdkWindowWin32Data struct. Use only
+       the extension_events field in GdkWindowPrivate. Previously one was
+       set, and the other one tested, which broke tablet functionality.
+
 1999-12-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkfont-win32.c (gdk_text_size, gdk_text_extents):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4b9721f0d3d7c5e56c3c6eaea85888de04e2d2b5..4c4732824760fa59afe45467a19a22aa83037349 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -7,6 +7,14 @@
 
        * gdk/gdk.def: Add gdk_xid_table_insert.
 
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkevents-win32.c
+       * gdk/win32/gdkinput-win32.c
+       * gdk/win32/gdkwindow-win32.c: Remove the superfluous
+       extension_events field in the GdkWindowWin32Data struct. Use only
+       the extension_events field in GdkWindowPrivate. Previously one was
+       set, and the other one tested, which broke tablet functionality.
+
 1999-12-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkfont-win32.c (gdk_text_size, gdk_text_extents):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4b9721f0d3d7c5e56c3c6eaea85888de04e2d2b5..4c4732824760fa59afe45467a19a22aa83037349 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -7,6 +7,14 @@
 
        * gdk/gdk.def: Add gdk_xid_table_insert.
 
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkevents-win32.c
+       * gdk/win32/gdkinput-win32.c
+       * gdk/win32/gdkwindow-win32.c: Remove the superfluous
+       extension_events field in the GdkWindowWin32Data struct. Use only
+       the extension_events field in GdkWindowPrivate. Previously one was
+       set, and the other one tested, which broke tablet functionality.
+
 1999-12-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkfont-win32.c (gdk_text_size, gdk_text_extents):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4b9721f0d3d7c5e56c3c6eaea85888de04e2d2b5..4c4732824760fa59afe45467a19a22aa83037349 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -7,6 +7,14 @@
 
        * gdk/gdk.def: Add gdk_xid_table_insert.
 
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkevents-win32.c
+       * gdk/win32/gdkinput-win32.c
+       * gdk/win32/gdkwindow-win32.c: Remove the superfluous
+       extension_events field in the GdkWindowWin32Data struct. Use only
+       the extension_events field in GdkWindowPrivate. Previously one was
+       set, and the other one tested, which broke tablet functionality.
+
 1999-12-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkfont-win32.c (gdk_text_size, gdk_text_extents):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4b9721f0d3d7c5e56c3c6eaea85888de04e2d2b5..4c4732824760fa59afe45467a19a22aa83037349 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -7,6 +7,14 @@
 
        * gdk/gdk.def: Add gdk_xid_table_insert.
 
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkevents-win32.c
+       * gdk/win32/gdkinput-win32.c
+       * gdk/win32/gdkwindow-win32.c: Remove the superfluous
+       extension_events field in the GdkWindowWin32Data struct. Use only
+       the extension_events field in GdkWindowPrivate. Previously one was
+       set, and the other one tested, which broke tablet functionality.
+
 1999-12-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkfont-win32.c (gdk_text_size, gdk_text_extents):

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index dd1f0cfe2b9c1d9d840bc1527578eec9871fc547..ec4c5e6e6e49a2e4b8280dc204e39ad7d463866d 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -3423,7 +3423,7 @@ gdk_event_translate (GdkEvent *event,
                         xevent->hwnd,
                         LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
 
-      if (GDK_WINDOW_WIN32DATA(window)->extension_events != 0
+      if (((GdkWindowPrivate *) window)->extension_events != 0
          && gdk_input_ignore_core)
        {
          GDK_NOTE (EVENTS, g_print ("...ignored\n"));

diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c
index 7550be4c4d9ae0409943ac9024c54588835f1481..b5cc6846d4929a5ee2218c390f23355eba192be5 100644 (file)
--- a/gdk/win32/gdkinput-win32.c
+++ b/gdk/win32/gdkinput-win32.c
@@ -1096,7 +1096,7 @@ gdk_input_win32_other_event (GdkEvent  *event,
        */
     dijkstra:
       if (!GDK_WINDOW_WIN32DATA (window)->extension_events_selected
-         || !(GDK_WINDOW_WIN32DATA (window)->extension_events & masktest))
+         || !(((GdkWindowPrivate *) window)->extension_events & masktest))
        {
          GDK_NOTE (EVENTS, g_print ("...not selected\n"));
 

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 235bba0993de032f580f73f96c25e01ab4deb78d..0536a192a7ff813512c451e51b0d16b966b70f8b 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -207,7 +207,6 @@ struct _GdkWindowWin32Data
   gint hint_min_width, hint_min_height;
   gint hint_max_width, hint_max_height;
 
-  gint extension_events;
   gboolean extension_events_selected;
 
   HKL input_locale;

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 1a470545533517029225a9bf5496898d00e77943..f77b98cf8852637e9a13b61b73c29a8b52565db9 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -110,7 +110,6 @@ gdk_win32_window_alloc (void)
   GDK_WINDOW_WIN32DATA (window)->bg_type = GDK_WIN32_BG_NORMAL;
   GDK_WINDOW_WIN32DATA (window)->xcursor = NULL;
   GDK_WINDOW_WIN32DATA (window)->hint_flags = 0;
-  GDK_WINDOW_WIN32DATA (window)->extension_events = 0;
   GDK_WINDOW_WIN32DATA (window)->extension_events_selected = FALSE;
   
   GDK_WINDOW_WIN32DATA (window)->input_locale = GetKeyboardLayout (0);
@@ -301,7 +300,6 @@ gdk_window_new (GdkWindow     *parent,
   private->drawable.width = (attributes->width > 1) ? (attributes->width) : (1);
   private->drawable.height = (attributes->height > 1) ? (attributes->height) : (1);
   private->drawable.window_type = attributes->window_type;
-  GDK_WINDOW_WIN32DATA (window)->extension_events = 0;
   GDK_WINDOW_WIN32DATA (window)->extension_events_selected = FALSE;
 
   if (attributes_mask & GDK_WA_VISUAL)