diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /docs/tools/widgets.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'docs/tools/widgets.c')
| -rw-r--r-- | docs/tools/widgets.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 4082599a9a..831a38fd18 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -42,6 +42,7 @@ adjust_size_callback (WidgetInfo *info) { Window toplevel; Window root; + GdkWindow *window; gint tx; gint ty; guint twidth; @@ -51,8 +52,9 @@ adjust_size_callback (WidgetInfo *info) gint target_width = 0; gint target_height = 0; - toplevel = find_toplevel_window (GDK_WINDOW_XID (info->window->window)); - XGetGeometry (GDK_WINDOW_XDISPLAY (info->window->window), + window = gtk_widget_get_window (info->window); + toplevel = find_toplevel_window (GDK_WINDOW_XID (window)); + XGetGeometry (GDK_WINDOW_XDISPLAY (window), toplevel, &root, &tx, &ty, &twidth, &theight, &tborder_width, &tdepth); @@ -995,11 +997,13 @@ static WidgetInfo * create_volume_button (void) { GtkWidget *button, *widget; + GtkWidget *plus_button; button = gtk_volume_button_new (); gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), 33); /* Hack: get the private dock */ - widget = gtk_scale_button_get_plus_button (GTK_SCALE_BUTTON (button))->parent->parent->parent; + plus_button = gtk_scale_button_get_plus_button (GTK_SCALE_BUTTON (button)); + widget = gtk_widget_get_parent (gtk_widget_get_parent (gtk_widget_get_parent (plus_button))); gtk_widget_show_all (widget); return new_widget_info ("volumebutton", widget, ASIS); } |