summaryrefslogtreecommitdiffstats
path: root/views/widget
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-27 20:26:58 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-27 20:26:58 +0000
commite133f95e6e64a5d9bf8bf0d1a435958efbe94cce (patch)
tree4f1ba3f7dc4c06faf28ef730ac4787b75f10e1dc /views/widget
parentb059d497ff6d968640617f9b998c38aa788275f3 (diff)
downloadchromium_src-e133f95e6e64a5d9bf8bf0d1a435958efbe94cce.zip
chromium_src-e133f95e6e64a5d9bf8bf0d1a435958efbe94cce.tar.gz
chromium_src-e133f95e6e64a5d9bf8bf0d1a435958efbe94cce.tar.bz2
Makes MenuButton compile and fixes bug in GtkWidget I happened upon.
BUG=none TEST=none Review URL: http://codereview.chromium.org/115826 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
-rw-r--r--views/widget/widget_gtk.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 64558ed..96a2ad3 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -13,8 +13,7 @@ namespace views {
// Returns the position of a widget on screen.
static void GetWidgetPositionOnScreen(GtkWidget* widget, int* x, int *y) {
- GtkWidget* parent = widget;
- while (parent) {
+ while (widget) {
if (GTK_IS_WINDOW(widget)) {
int window_x, window_y;
gtk_window_get_position(GTK_WINDOW(widget), &window_x, &window_y);
@@ -25,7 +24,7 @@ static void GetWidgetPositionOnScreen(GtkWidget* widget, int* x, int *y) {
// Not a window.
*x += widget->allocation.x;
*y += widget->allocation.y;
- parent = gtk_widget_get_parent(parent);
+ widget = gtk_widget_get_parent(widget);
}
}