summaryrefslogtreecommitdiffstats
path: root/views/controls/button
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-03 23:05:31 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-03 23:05:31 +0000
commitaee6bbf90e2fb86525ef26134263699acc19152b (patch)
tree0eb512689839038ab942ebec08b1aabd1da43f55 /views/controls/button
parentad8dfe51be8da4c0f14fa924020055025fb90ffa (diff)
downloadchromium_src-aee6bbf90e2fb86525ef26134263699acc19152b.zip
chromium_src-aee6bbf90e2fb86525ef26134263699acc19152b.tar.gz
chromium_src-aee6bbf90e2fb86525ef26134263699acc19152b.tar.bz2
Removing ATL dependencies from two files.
BUG=None TEST=None Review URL: http://codereview.chromium.org/201010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
-rw-r--r--views/controls/button/native_button.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index f631bd8..ea97e54 100644
--- a/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -4,11 +4,6 @@
#include "views/controls/button/native_button.h"
-#if defined(OS_WIN)
-#include <atlbase.h>
-#include <atlapp.h> // for GET_X/Y_LPARAM
-#endif
-
#if defined(OS_LINUX)
#include <gdk/gdkkeysyms.h>
#include "views/screen.h"
@@ -103,7 +98,8 @@ void NativeButton::ButtonPressed() {
// TODO(beng): obtain mouse event flags for native buttons someday.
#if defined(OS_WIN)
DWORD pos = GetMessagePos();
- gfx::Point cursor_point(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
+ POINTS points = MAKEPOINTS(pos);
+ gfx::Point cursor_point(points.x, points.y);
#elif defined(OS_LINUX)
gfx::Point cursor_point = Screen::GetCursorScreenPoint();
#endif
@@ -180,7 +176,8 @@ bool NativeButton::AcceleratorPressed(const Accelerator& accelerator) {
if (IsEnabled()) {
#if defined(OS_WIN)
DWORD pos = GetMessagePos();
- gfx::Point cursor_point(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
+ POINTS points = MAKEPOINTS(pos);
+ gfx::Point cursor_point(points.x, points.y);
#elif defined(OS_LINUX)
gfx::Point cursor_point = Screen::GetCursorScreenPoint();
#endif