diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/button/custom_button.cc | 4 | ||||
| -rw-r--r-- | views/widget/drop_target_gtk.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc index 69ac840..f9a58f6 100644 --- a/views/controls/button/custom_button.cc +++ b/views/controls/button/custom_button.cc @@ -96,8 +96,8 @@ bool CustomButton::AcceleratorPressed(const Accelerator& accelerator) { memset(&gdk_key, 0, sizeof(GdkEventKey)); gdk_key.type = GDK_KEY_RELEASE; gdk_key.keyval = accelerator.GetKeyCode(); - gdk_key.state = accelerator.IsAltDown() << 3 + - accelerator.IsCtrlDown() << 2 + + gdk_key.state = (accelerator.IsAltDown() << 3) + + (accelerator.IsCtrlDown() << 2) + accelerator.IsShiftDown(); KeyEvent key_event(&gdk_key, false); #endif diff --git a/views/widget/drop_target_gtk.cc b/views/widget/drop_target_gtk.cc index d262e3e..2947e63 100644 --- a/views/widget/drop_target_gtk.cc +++ b/views/widget/drop_target_gtk.cc @@ -302,7 +302,7 @@ void DropTargetGtk::RequestFormats(GdkDragContext* context, requested_formats_ |= OSExchangeData::FILE_CONTENTS; NOTIMPLEMENTED(); } - if ((formats & OSExchangeData::FILE_NAME != 0) && + if (((formats & OSExchangeData::FILE_NAME) != 0) && (requested_formats_ & OSExchangeData::FILE_NAME) == 0) { requested_formats_ |= OSExchangeData::FILE_NAME; NOTIMPLEMENTED(); |