Event timestamps don't have to be unique. As long as they are

2004-11-10  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkevents-win32.c (_gdk_win32_get_next_tick):
	Event timestamps don't have to be unique. As long as they are
	nondecreasing we should be fine. Solves problems with for instance
	long menus not staying up on first click. (#152035, Robert Ögren)

diff --git a/ChangeLog b/ChangeLog
index 8ff34d80b61cd9ac3ced9aba8d045d06bd670311..054403aea2667b9ff03763c1abe67a7bb5d8c58f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-10  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (_gdk_win32_get_next_tick): 
+       Event timestamps don't have to be unique. As long as they are
+       nondecreasing we should be fine. Solves problems with for instance
+       long menus not staying up on first click. (#152035, Robert Ögren)
+
 2004-11-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8ff34d80b61cd9ac3ced9aba8d045d06bd670311..054403aea2667b9ff03763c1abe67a7bb5d8c58f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-11-10  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (_gdk_win32_get_next_tick): 
+       Event timestamps don't have to be unique. As long as they are
+       nondecreasing we should be fine. Solves problems with for instance
+       long menus not staying up on first click. (#152035, Robert Ögren)
+
 2004-11-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8ff34d80b61cd9ac3ced9aba8d045d06bd670311..054403aea2667b9ff03763c1abe67a7bb5d8c58f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-11-10  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (_gdk_win32_get_next_tick): 
+       Event timestamps don't have to be unique. As long as they are
+       nondecreasing we should be fine. Solves problems with for instance
+       long menus not staying up on first click. (#152035, Robert Ögren)
+
 2004-11-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8ff34d80b61cd9ac3ced9aba8d045d06bd670311..054403aea2667b9ff03763c1abe67a7bb5d8c58f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-11-10  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (_gdk_win32_get_next_tick): 
+       Event timestamps don't have to be unique. As long as they are
+       nondecreasing we should be fine. Solves problems with for instance
+       long menus not staying up on first click. (#152035, Robert Ögren)
+
 2004-11-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index e9eea03ce76c459b114b3ab520c1ef579f420304..03b742133220edbc9222e36ab33cd25d62424213 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -225,7 +225,7 @@ _gdk_win32_get_next_tick (gulong suggested_tick)
   if (suggested_tick == 0)
     suggested_tick = GetTickCount ();
   if (suggested_tick <= cur_tick)
-    return ++cur_tick;
+    return cur_tick;
   else
     return cur_tick = suggested_tick;
 }