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

Side by Side Diff: webkit/tools/test_shell/webwidget_host_gtk.cc

Issue 7227027: GTK: More 2.18 goodness. Move from macros to real accessor functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove views/ Created 9 years, 5 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 | « ui/gfx/gtk_preserve_window.cc ('k') | no next file » | 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 #include "webkit/tools/test_shell/webwidget_host.h" 5 #include "webkit/tools/test_shell/webwidget_host.h"
6 6
7 #include <cairo/cairo.h> 7 #include <cairo/cairo.h>
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 gtk_fixed_set_has_window(GTK_FIXED(widget), true); 69 gtk_fixed_set_has_window(GTK_FIXED(widget), true);
70 70
71 gtk_box_pack_start(GTK_BOX(parent_view), widget, TRUE, TRUE, 0); 71 gtk_box_pack_start(GTK_BOX(parent_view), widget, TRUE, TRUE, 0);
72 72
73 gtk_widget_add_events(widget, GDK_EXPOSURE_MASK | 73 gtk_widget_add_events(widget, GDK_EXPOSURE_MASK |
74 GDK_POINTER_MOTION_MASK | 74 GDK_POINTER_MOTION_MASK |
75 GDK_BUTTON_PRESS_MASK | 75 GDK_BUTTON_PRESS_MASK |
76 GDK_BUTTON_RELEASE_MASK | 76 GDK_BUTTON_RELEASE_MASK |
77 GDK_KEY_PRESS_MASK | 77 GDK_KEY_PRESS_MASK |
78 GDK_KEY_RELEASE_MASK); 78 GDK_KEY_RELEASE_MASK);
79 GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS); 79 gtk_widget_set_can_focus(widget, TRUE);
80 g_signal_connect(widget, "size-request", 80 g_signal_connect(widget, "size-request",
81 G_CALLBACK(&HandleSizeRequest), host); 81 G_CALLBACK(&HandleSizeRequest), host);
82 g_signal_connect(widget, "size-allocate", 82 g_signal_connect(widget, "size-allocate",
83 G_CALLBACK(&HandleSizeAllocate), host); 83 G_CALLBACK(&HandleSizeAllocate), host);
84 g_signal_connect(widget, "configure-event", 84 g_signal_connect(widget, "configure-event",
85 G_CALLBACK(&HandleConfigure), host); 85 G_CALLBACK(&HandleConfigure), host);
86 g_signal_connect(widget, "expose-event", 86 g_signal_connect(widget, "expose-event",
87 G_CALLBACK(&HandleExpose), host); 87 G_CALLBACK(&HandleExpose), host);
88 g_signal_connect(widget, "destroy", 88 g_signal_connect(widget, "destroy",
89 G_CALLBACK(&HandleDestroy), host); 89 G_CALLBACK(&HandleDestroy), host);
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 430
431 void WebWidgetHost::PaintRect(const gfx::Rect& rect) { 431 void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
432 set_painting(true); 432 set_painting(true);
433 webwidget_->paint(canvas_.get(), rect); 433 webwidget_->paint(canvas_.get(), rect);
434 set_painting(false); 434 set_painting(false);
435 } 435 }
436 436
437 void WebWidgetHost::WindowDestroyed() { 437 void WebWidgetHost::WindowDestroyed() {
438 delete this; 438 delete this;
439 } 439 }
OLDNEW
« no previous file with comments | « ui/gfx/gtk_preserve_window.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698