Commit 605c562f authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

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.
parent 68a6e7be
......@@ -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):
......
......@@ -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):
......
......@@ -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):
......
......@@ -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):
......
......@@ -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):
......
......@@ -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):
......
......@@ -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):
......
......@@ -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"));
......
......@@ -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"));
......
......@@ -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;
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment