Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: views/widget/widget_gtk.h

Issue 6823055: Consolidate OnKeyEvent and InputMethod code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore IME call in accelerator_handler_touch.cc. Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/widget/widget.cc ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef VIEWS_WIDGET_WIDGET_GTK_H_ 5 #ifndef VIEWS_WIDGET_WIDGET_GTK_H_
6 #define VIEWS_WIDGET_WIDGET_GTK_H_ 6 #define VIEWS_WIDGET_WIDGET_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 CHROMEGTK_CALLBACK_2(WidgetGtk, void, OnDragLeave, 265 CHROMEGTK_CALLBACK_2(WidgetGtk, void, OnDragLeave,
266 GdkDragContext*, guint); 266 GdkDragContext*, guint);
267 CHROMEGTK_CALLBACK_4(WidgetGtk, gboolean, OnDragMotion, 267 CHROMEGTK_CALLBACK_4(WidgetGtk, gboolean, OnDragMotion,
268 GdkDragContext*, gint, gint, guint); 268 GdkDragContext*, gint, gint, guint);
269 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnEnterNotify, GdkEventCrossing*); 269 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnEnterNotify, GdkEventCrossing*);
270 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnLeaveNotify, GdkEventCrossing*); 270 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnLeaveNotify, GdkEventCrossing*);
271 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnMotionNotify, GdkEventMotion*); 271 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnMotionNotify, GdkEventMotion*);
272 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnButtonRelease, GdkEventButton*); 272 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnButtonRelease, GdkEventButton*);
273 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnFocusIn, GdkEventFocus*); 273 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnFocusIn, GdkEventFocus*);
274 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnFocusOut, GdkEventFocus*); 274 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnFocusOut, GdkEventFocus*);
275 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnKeyEvent, GdkEventKey*); 275 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnEventKey, GdkEventKey*);
276 CHROMEGTK_CALLBACK_4(WidgetGtk, gboolean, OnQueryTooltip, 276 CHROMEGTK_CALLBACK_4(WidgetGtk, gboolean, OnQueryTooltip,
277 gint, gint, gboolean, GtkTooltip*); 277 gint, gint, gboolean, GtkTooltip*);
278 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnScroll, GdkEventScroll*); 278 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnScroll, GdkEventScroll*);
279 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnVisibilityNotify, 279 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnVisibilityNotify,
280 GdkEventVisibility*); 280 GdkEventVisibility*);
281 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnGrabBrokeEvent, GdkEvent*); 281 CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnGrabBrokeEvent, GdkEvent*);
282 CHROMEGTK_CALLBACK_1(WidgetGtk, void, OnGrabNotify, gboolean); 282 CHROMEGTK_CALLBACK_1(WidgetGtk, void, OnGrabNotify, gboolean);
283 CHROMEGTK_CALLBACK_0(WidgetGtk, void, OnDestroy); 283 CHROMEGTK_CALLBACK_0(WidgetGtk, void, OnDestroy);
284 CHROMEGTK_CALLBACK_0(WidgetGtk, void, OnShow); 284 CHROMEGTK_CALLBACK_0(WidgetGtk, void, OnShow);
285 CHROMEGTK_CALLBACK_0(WidgetGtk, void, OnMap); 285 CHROMEGTK_CALLBACK_0(WidgetGtk, void, OnMap);
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 bool painted_; 433 bool painted_;
434 434
435 scoped_ptr<InputMethod> input_method_; 435 scoped_ptr<InputMethod> input_method_;
436 436
437 DISALLOW_COPY_AND_ASSIGN(WidgetGtk); 437 DISALLOW_COPY_AND_ASSIGN(WidgetGtk);
438 }; 438 };
439 439
440 } // namespace views 440 } // namespace views
441 441
442 #endif // VIEWS_WIDGET_WIDGET_GTK_H_ 442 #endif // VIEWS_WIDGET_WIDGET_GTK_H_
OLDNEW
« no previous file with comments | « views/widget/widget.cc ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698