diff options
| author | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-07 19:01:41 +0000 |
|---|---|---|
| committer | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-07 19:01:41 +0000 |
| commit | 7e93e2f52a534ff2fb1434ae7bca88dc8bd8e4df (patch) | |
| tree | cbc5f50dbf28f24d71383466e6a6cd6d4aef6aec /views | |
| parent | 3ee8e02bec65d80ed1ae652470af1c97f1575559 (diff) | |
| download | chromium_src-7e93e2f52a534ff2fb1434ae7bca88dc8bd8e4df.zip chromium_src-7e93e2f52a534ff2fb1434ae7bca88dc8bd8e4df.tar.gz chromium_src-7e93e2f52a534ff2fb1434ae7bca88dc8bd8e4df.tar.bz2 | |
Fix some gcc 4.4 issues when compiling with toolkit_views.
Most of these squash harmless compiler warnings but the custom_button.cc
change fixes a real problem with the accelerator key bitmask calculation
(+ preceeds << in terms of operator precedence)
The change to tab_strip.cc is ugly but it fixes the following error:
chrome/browser/views/tabs/tab_strip.cc: In member function
‘void TabStrip::StartRemoveTabAnimation(int, TabContents*)’:
chrome/browser/views/tabs/tab_strip.cc:201: error: assuming
signed overflow does not occur when assuming that
(X - c) > X is always false
As an added bonus, this makes the Linux shared build of toolkit_views
work too.
Review URL: http://codereview.chromium.org/199025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25602 0039d316-1c4b-4281-b951-d872f2087c98
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(); |