[gnumeric] UI: Fix modifier handling.



commit c6429a6231c701cf7a1c62675546e8b5142b367b
Author: Morten Welinder <terra gnome org>
Date:   Tue Jan 20 10:59:55 2015 -0500

    UI: Fix modifier handling.
    
    This should fix certain problems with Alt-Enter.

 ChangeLog      |    5 +++++
 NEWS           |    1 +
 src/gui-util.h |    2 +-
 3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d4ffe1b..97f57d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-20  Morten Welinder  <terra gnome org>
+
+       * src/gui-util.h (gnumeric_filter_modifiers): Drop reserved bits.
+       See bug #743130.
+
 2015-01-19  Morten Welinder  <terra gnome org>
 
        * src/gutils.c (gnm_icon_dir): Remove.
diff --git a/NEWS b/NEWS
index cc4812c..25ad15e 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,7 @@ Morten:
        * Improve xlsx graph export: line style; bar/col direction; marker shape;
          marker size; marker color; axis label; chart title.
        * Improve xlsx export: default col widths; schema validity.
+       * Improve modifier handling.  [#743130]
 
 Thomas Kluyver:
        * Fix import of extended floats from wk4 files.  [#739679]
diff --git a/src/gui-util.h b/src/gui-util.h
index 51ff797..5cb9cc2 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -67,7 +67,7 @@ void gnumeric_create_popup_menu (GnumericPopupMenuElement const *elements,
                                 int sensitive_filter,
                                 GdkEvent *event);
 
-#define gnumeric_filter_modifiers(a) ((a) &(~(GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD5_MASK)))
+#define gnumeric_filter_modifiers(a) ((a) & (GDK_MODIFIER_MASK & 
(~(GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD5_MASK))))
 
 void gnumeric_init_help_button (GtkWidget *w, char const *link);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]