| Index: views/native_types.h
|
| ===================================================================
|
| --- views/native_types.h (revision 74437)
|
| +++ views/native_types.h (working copy)
|
| @@ -8,18 +8,35 @@
|
|
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| +#if defined(OS_LINUX)
|
| +typedef union _GdkEvent GdkEvent;
|
| +#endif
|
| +#if defined(TOUCH_UI)
|
| +typedef union _XEvent XEvent;
|
| +#endif
|
| +
|
| namespace views {
|
|
|
| +// A note about NativeEvent and NativeEvent2.
|
| +// 1. Eventually TOOLKIT_VIEWS will converge on using XEvent as we remove
|
| +// Gtk/Gdk from the stack.
|
| +// 2. TOUCH_UI needs XEvents now for certain event types.
|
| +// 3. TOUCH_UI also needs GdkEvents for certain event types.
|
| +//
|
| +// => NativeEvent and NativeEvent2.
|
| +// Once we get rid of Gtk/Gdk, we can re-typedef NativeEvent to XEvent, remove
|
| +// the dummy NativeEvent2, and the world will be beautiful.
|
| +
|
| #if defined(OS_WIN)
|
| typedef MSG NativeEvent;
|
| #endif
|
| #if defined(OS_LINUX)
|
| -typedef union _GdkEvent GdkEvent;
|
| typedef GdkEvent* NativeEvent;
|
| #endif
|
| #if defined(TOUCH_UI)
|
| -typedef union _XEvent XEvent;
|
| -typedef XEvent* NativeEvent;
|
| +typedef XEvent* NativeEvent2;
|
| +#else
|
| +typedef void* NativeEvent2;
|
| #endif
|
|
|
| } // namespace views
|
|
|