diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 21:04:17 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 21:04:17 +0000 |
| commit | efc6544b43973ee7dfed1f7e56986982e42ebee0 (patch) | |
| tree | bfc655f45240b2d7da4148983123e073dff04ebe /views/event.h | |
| parent | c3bb07a6e81588caaf2d5efced692b2166a30161 (diff) | |
| download | chromium_src-efc6544b43973ee7dfed1f7e56986982e42ebee0.zip chromium_src-efc6544b43973ee7dfed1f7e56986982e42ebee0.tar.gz chromium_src-efc6544b43973ee7dfed1f7e56986982e42ebee0.tar.bz2 | |
Resurrect Scott's WindowGtk changes.
http://crbug.com/11387
Review URL: http://codereview.chromium.org/115143
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/event.h')
| -rw-r--r-- | views/event.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/views/event.h b/views/event.h index f0ab24a..70d0abc 100644 --- a/views/event.h +++ b/views/event.h @@ -6,13 +6,12 @@ #define VIEWS_EVENT_H_ #include "base/basictypes.h" +#include "base/gfx/point.h" #if defined(OS_LINUX) -#include <gdk/gdk.h> +typedef struct _GdkEventKey GdkEventKey; #endif -#include "base/gfx/point.h" - class OSExchangeData; namespace views { @@ -218,7 +217,7 @@ class MouseEvent : public LocatedEvent { } private: - DISALLOW_EVIL_CONSTRUCTORS(MouseEvent); + DISALLOW_COPY_AND_ASSIGN(MouseEvent); }; //////////////////////////////////////////////////////////////////////////////// @@ -235,7 +234,7 @@ class KeyEvent : public Event { // Create a new key event KeyEvent(EventType type, int ch, int repeat_count, int message_flags); #elif defined(OS_LINUX) - KeyEvent(GdkEventKey* event); + explicit KeyEvent(GdkEventKey* event); #endif int GetCharacter() const { @@ -259,7 +258,7 @@ class KeyEvent : public Event { int repeat_count_; int message_flags_; - DISALLOW_EVIL_CONSTRUCTORS(KeyEvent); + DISALLOW_COPY_AND_ASSIGN(KeyEvent); }; //////////////////////////////////////////////////////////////////////////////// @@ -284,7 +283,7 @@ class MouseWheelEvent : public LocatedEvent { private: int offset_; - DISALLOW_EVIL_CONSTRUCTORS(MouseWheelEvent); + DISALLOW_COPY_AND_ASSIGN(MouseWheelEvent); }; //////////////////////////////////////////////////////////////////////////////// @@ -316,7 +315,7 @@ class DropTargetEvent : public LocatedEvent { const OSExchangeData& data_; int source_operations_; - DISALLOW_EVIL_CONSTRUCTORS(DropTargetEvent); + DISALLOW_COPY_AND_ASSIGN(DropTargetEvent); }; } // namespace views |