Set also group in the key press/release events, always to zero for now.

2002-02-24  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkevents-win32.c (build_keypress_event,
	build_keyrelease_event, gdk_event_translate): Set also group in
	the key press/release events, always to zero for now.

diff --git a/ChangeLog b/ChangeLog
index 0d970bfa5cfc9bdf4ede43d4af05e094d8ee6830..3e4ecf6566be9fb4e75358be6fd1f9f1da1af73c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-24  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (build_keypress_event,
+       build_keyrelease_event, gdk_event_translate): Set also group in
+       the key press/release events, always to zero for now.
+
 2002-02-24  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/stock-icons/stock_dialog_error_48.png: 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0d970bfa5cfc9bdf4ede43d4af05e094d8ee6830..3e4ecf6566be9fb4e75358be6fd1f9f1da1af73c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-02-24  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (build_keypress_event,
+       build_keyrelease_event, gdk_event_translate): Set also group in
+       the key press/release events, always to zero for now.
+
 2002-02-24  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/stock-icons/stock_dialog_error_48.png: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0d970bfa5cfc9bdf4ede43d4af05e094d8ee6830..3e4ecf6566be9fb4e75358be6fd1f9f1da1af73c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-02-24  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (build_keypress_event,
+       build_keyrelease_event, gdk_event_translate): Set also group in
+       the key press/release events, always to zero for now.
+
 2002-02-24  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/stock-icons/stock_dialog_error_48.png: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0d970bfa5cfc9bdf4ede43d4af05e094d8ee6830..3e4ecf6566be9fb4e75358be6fd1f9f1da1af73c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-02-24  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (build_keypress_event,
+       build_keyrelease_event, gdk_event_translate): Set also group in
+       the key press/release events, always to zero for now.
+
 2002-02-24  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/stock-icons/stock_dialog_error_48.png: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0d970bfa5cfc9bdf4ede43d4af05e094d8ee6830..3e4ecf6566be9fb4e75358be6fd1f9f1da1af73c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-02-24  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (build_keypress_event,
+       build_keyrelease_event, gdk_event_translate): Set also group in
+       the key press/release events, always to zero for now.
+
 2002-02-24  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/stock-icons/stock_dialog_error_48.png: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0d970bfa5cfc9bdf4ede43d4af05e094d8ee6830..3e4ecf6566be9fb4e75358be6fd1f9f1da1af73c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-02-24  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (build_keypress_event,
+       build_keyrelease_event, gdk_event_translate): Set also group in
+       the key press/release events, always to zero for now.
+
 2002-02-24  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/stock-icons/stock_dialog_error_48.png: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0d970bfa5cfc9bdf4ede43d4af05e094d8ee6830..3e4ecf6566be9fb4e75358be6fd1f9f1da1af73c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-02-24  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (build_keypress_event,
+       build_keyrelease_event, gdk_event_translate): Set also group in
+       the key press/release events, always to zero for now.
+
 2002-02-24  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/stock-icons/stock_dialog_error_48.png: 

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 722deca48d0f1c65cecc7fb4323dd15213659829..efa5e7c7d52e18a9d8f0cd298028cacc825a84e9 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -847,6 +847,7 @@ build_keypress_event (GdkWindowImplWin32 *impl,
   event->key.type = GDK_KEY_PRESS;
   event->key.time = msg->time;
   event->key.state = 0;
+  event->key.group = 0;                /* ??? */
   
   if (msg->message == WM_IME_COMPOSITION)
     {
@@ -887,6 +888,7 @@ build_keypress_event (GdkWindowImplWin32 *impl,
        * to Unicode. Then convert to UTF-8.
        * We don't handle the surrogate stuff. Should we?
        */
+      GDK_NOTE (EVENTS, g_print ("ciACP=%d\n", impl->charset_info.ciACP));
       ucount = MultiByteToWideChar (impl->charset_info.ciACP,
                                    0, buf, bytecount,
                                    wbuf, G_N_ELEMENTS (wbuf));
@@ -935,6 +937,7 @@ build_keyrelease_event (GdkWindowImplWin32 *impl,
   event->key.type = GDK_KEY_RELEASE;
   event->key.time = msg->time;
   event->key.state = 0;
+  event->key.group = 0;                /* ??? */
 
   if (msg->message == WM_CHAR || msg->message == WM_SYSCHAR)
     if (msg->wParam < ' ')
@@ -2327,6 +2330,7 @@ gdk_event_translate (GdkEvent *event,
        event->key.state |= GDK_CONTROL_MASK;
       if (msg->wParam != VK_MENU && GetKeyState (VK_MENU) < 0)
        event->key.state |= GDK_MOD1_MASK;
+      event->key.group = 0;    /* ??? */
       event->key.string = NULL;
       event->key.length = 0;
       return_val = !GDK_WINDOW_DESTROYED (window);
@@ -2393,8 +2397,7 @@ gdk_event_translate (GdkEvent *event,
          /* Return the key release event.  */
          build_keyrelease_event (window_impl, event, msg);
        }
-      else if (return_val
-              && (window_impl->event_mask & GDK_KEY_PRESS_MASK))
+      else if (return_val && (window_impl->event_mask & GDK_KEY_PRESS_MASK))
        {
          /* Return just the key press event. */
          build_keypress_event (window_impl, event, msg);