summaryrefslogtreecommitdiffstats
path: root/views/events
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 20:58:29 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 20:58:29 +0000
commit5036f187c5431c1afc5bac442e1d74390d7a3fa0 (patch)
treeaf465cf27c50860ca7773876ac7bf08b6b653875 /views/events
parent26c740c8fb36d3e59200cfab668eb9c5f7539d11 (diff)
downloadchromium_src-5036f187c5431c1afc5bac442e1d74390d7a3fa0.zip
chromium_src-5036f187c5431c1afc5bac442e1d74390d7a3fa0.tar.gz
chromium_src-5036f187c5431c1afc5bac442e1d74390d7a3fa0.tar.bz2
Rename VIEWS_API to VIEWS_EXPORT.
R=rvargas@chromium.org Review URL: http://codereview.chromium.org/7550038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/events')
-rw-r--r--views/events/event.h20
-rw-r--r--views/events/event_utils_win.h4
2 files changed, 12 insertions, 12 deletions
diff --git a/views/events/event.h b/views/events/event.h
index c0fabbb..3278bc4 100644
--- a/views/events/event.h
+++ b/views/events/event.h
@@ -12,7 +12,7 @@
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/gfx/point.h"
#include "views/native_types.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
#if defined(USE_X11)
typedef union _XEvent XEvent;
@@ -33,8 +33,8 @@ class RootView;
}
#if defined(OS_WIN)
-VIEWS_API bool IsClientMouseEvent(const views::NativeEvent& native_event);
-VIEWS_API bool IsNonClientMouseEvent(const views::NativeEvent& native_event);
+VIEWS_EXPORT bool IsClientMouseEvent(const views::NativeEvent& native_event);
+VIEWS_EXPORT bool IsNonClientMouseEvent(const views::NativeEvent& native_event);
#endif
////////////////////////////////////////////////////////////////////////////////
@@ -49,7 +49,7 @@ VIEWS_API bool IsNonClientMouseEvent(const views::NativeEvent& native_event);
// Events are immutable but support copy
//
////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API Event {
+class VIEWS_EXPORT Event {
public:
// This type exists to distinguish between the NativeEvent and NativeEvent2
// constructors.
@@ -138,7 +138,7 @@ class VIEWS_API Event {
// position in the screen.
//
////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API LocatedEvent : public Event {
+class VIEWS_EXPORT LocatedEvent : public Event {
public:
int x() const { return location_.x(); }
int y() const { return location_.y(); }
@@ -173,7 +173,7 @@ class TouchEvent;
// A mouse event is used for any input event related to the mouse.
//
////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API MouseEvent : public LocatedEvent {
+class VIEWS_EXPORT MouseEvent : public LocatedEvent {
public:
explicit MouseEvent(NativeEvent native_event);
MouseEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native);
@@ -245,7 +245,7 @@ class VIEWS_API MouseEvent : public LocatedEvent {
// TouchEvent and PlatformTouchPoint.
//
////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API TouchEvent : public LocatedEvent {
+class VIEWS_EXPORT TouchEvent : public LocatedEvent {
public:
TouchEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native);
@@ -303,7 +303,7 @@ class VIEWS_API TouchEvent : public LocatedEvent {
// KeyEvent encapsulates keyboard input events - key press and release.
//
////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API KeyEvent : public Event {
+class VIEWS_EXPORT KeyEvent : public Event {
public:
explicit KeyEvent(NativeEvent native_event);
KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native);
@@ -376,7 +376,7 @@ class VIEWS_API KeyEvent : public Event {
// Note: e.GetOffset() > 0 means scroll up / left.
//
////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API MouseWheelEvent : public MouseEvent {
+class VIEWS_EXPORT MouseWheelEvent : public MouseEvent {
public:
// See |offset| for details.
static const int kWheelDelta;
@@ -409,7 +409,7 @@ class VIEWS_API MouseWheelEvent : public MouseEvent {
// drop operation.
//
////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API DropTargetEvent : public LocatedEvent {
+class VIEWS_EXPORT DropTargetEvent : public LocatedEvent {
public:
DropTargetEvent(const OSExchangeData& data,
int x,
diff --git a/views/events/event_utils_win.h b/views/events/event_utils_win.h
index 258fa61..b11b45c 100644
--- a/views/events/event_utils_win.h
+++ b/views/events/event_utils_win.h
@@ -7,7 +7,7 @@
#pragma once
#include "ui/gfx/native_widget_types.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
// Windows-specific Event utilities. Add functionality here rather than adding
// #ifdefs to event.h
@@ -24,7 +24,7 @@ int GetRepeatCount(const KeyEvent& event);
// Returns true if the affected key is a Windows extended key. See documentation
// for WM_KEYDOWN for explanation.
// Valid only for KeyEvents constructed from a MSG.
-VIEWS_API bool IsExtendedKey(const KeyEvent& event);
+VIEWS_EXPORT bool IsExtendedKey(const KeyEvent& event);
// Return a mask of windows key/button state flags for the event object.
int GetWindowsFlags(const Event& event);