summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/testcombochange.c7
-rw-r--r--tests/testfilechooserbutton.c15
-rw-r--r--tests/testgtk.c250
-rw-r--r--tests/testmultidisplay.c12
-rw-r--r--tests/testselection.c13
-rwxr-xr-xtests/teststatusicon.c9
6 files changed, 182 insertions, 124 deletions
diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index f950150853..c3ed117cce 100644
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -234,6 +234,7 @@ on_animate (void)
int
main (int argc, char **argv)
{
+ GtkWidget *content_area;
GtkWidget *dialog;
GtkWidget *scrolled_window;
GtkWidget *hbox;
@@ -256,10 +257,12 @@ main (int argc, char **argv)
NULL, GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
-
+
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
combo_vbox = gtk_vbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (hbox), combo_vbox, FALSE, FALSE, 0);
diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index 357bafbf27..d7db117368 100644
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -49,10 +49,15 @@ static gchar *gtk_src_dir = NULL;
static void
win_style_set_cb (GtkWidget *win)
{
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (win)->vbox), 12);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (win)->vbox), 24);
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (win)->action_area), 0);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (win)->action_area), 6);
+ GtkWidget *content_area, *action_area;
+
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (win));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (win));
+
+ gtk_container_set_border_width (GTK_CONTAINER (content_area), 12);
+ gtk_box_set_spacing (GTK_BOX (content_area), 24);
+ gtk_container_set_border_width (GTK_CONTAINER (action_area), 0);
+ gtk_box_set_spacing (GTK_BOX (action_area), 6);
}
static gboolean
@@ -287,7 +292,7 @@ main (int argc,
g_signal_connect (win, "response", G_CALLBACK (gtk_main_quit), NULL);
vbox = gtk_vbox_new (FALSE, 18);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (win)->vbox), vbox);
+ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (win))), vbox);
frame = gtk_frame_new ("<b>GtkFileChooserButton</b>");
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 94ac27deb8..54d2b1bc14 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -349,6 +349,7 @@ create_alpha_window (GtkWidget *widget)
if (!window)
{
+ GtkWidget *content_area;
GtkWidget *vbox;
GtkWidget *label;
@@ -360,10 +361,12 @@ create_alpha_window (GtkWidget *widget)
gtk_widget_set_app_paintable (window, TRUE);
g_signal_connect (window, "expose-event",
G_CALLBACK (on_alpha_window_expose), NULL);
+
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
vbox = gtk_vbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox,
+ gtk_box_pack_start (GTK_BOX (content_area), vbox,
TRUE, TRUE, 0);
label = gtk_label_new (NULL);
@@ -678,6 +681,7 @@ static void
create_big_windows (GtkWidget *widget)
{
static GtkWidget *window = NULL;
+ GtkWidget *content_area;
GtkWidget *darea, *table, *scrollbar;
GtkWidget *eventbox;
GtkAdjustment *hadj;
@@ -709,9 +713,10 @@ create_big_windows (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroy),
NULL);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
table = gtk_table_new (2, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
- table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0);
darea = gtk_drawing_area_new ();
@@ -1050,7 +1055,7 @@ create_check_buttons (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroy),
NULL);
- box1 = GTK_DIALOG (window)->vbox;
+ box1 = gtk_dialog_get_content_area (GTK_DIALOG (window));
box2 = gtk_vbox_new (FALSE, 10);
gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
@@ -1115,7 +1120,7 @@ create_radio_buttons (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroy),
NULL);
- box1 = GTK_DIALOG (window)->vbox;
+ box1 = gtk_dialog_get_content_area (GTK_DIALOG (window));
box2 = gtk_vbox_new (FALSE, 10);
gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
@@ -1815,6 +1820,7 @@ gridded_geometry_response (GtkDialog *dialog,
{
gchar *geometry_string = g_strdup (gtk_entry_get_text (entry));
gchar *title = g_strdup_printf ("Gridded window at: %s", geometry_string);
+ GtkWidget *content_area;
GtkWidget *window;
GtkWidget *drawing_area;
GtkWidget *box;
@@ -1832,8 +1838,10 @@ gridded_geometry_response (GtkDialog *dialog,
g_signal_connect (window, "response",
G_CALLBACK (gridded_geometry_subresponse), geometry_string);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
box = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), box, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), box, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (box), 7);
@@ -1877,6 +1885,7 @@ create_gridded_geometry (GtkWidget *widget)
{
static GtkWidget *window = NULL;
gpointer window_ptr;
+ GtkWidget *content_area;
GtkWidget *entry;
GtkWidget *label;
@@ -1891,12 +1900,14 @@ create_gridded_geometry (GtkWidget *widget)
gtk_window_set_screen (GTK_WINDOW (window),
gtk_widget_get_screen (widget));
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
label = gtk_label_new ("Geometry string:");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), label, FALSE, FALSE, 0);
entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry), DEFAULT_GEOMETRY);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), entry, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), entry, FALSE, FALSE, 0);
g_signal_connect (window, "response",
G_CALLBACK (gridded_geometry_response), entry);
@@ -2652,6 +2663,7 @@ static void
create_rotated_label (GtkWidget *widget)
{
static GtkWidget *window = NULL;
+ GtkWidget *content_area;
GtkWidget *vbox;
GtkWidget *hscale;
GtkWidget *label;
@@ -2675,8 +2687,10 @@ create_rotated_label (GtkWidget *widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
vbox = gtk_vbox_new (FALSE, 5);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
label = gtk_label_new (NULL);
@@ -2811,6 +2825,7 @@ create_rotated_text (GtkWidget *widget)
{
const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
GtkRequisition requisition;
+ GtkWidget *content_area;
GtkWidget *drawing_area;
GdkPixbuf *tile_pixbuf;
@@ -2829,8 +2844,10 @@ create_rotated_text (GtkWidget *widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
drawing_area = gtk_drawing_area_new ();
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), drawing_area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), drawing_area, TRUE, TRUE, 0);
gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
tile_pixbuf = gdk_pixbuf_new_from_file ("marble.xpm", NULL);
@@ -4066,7 +4083,8 @@ create_key_lookup (GtkWidget *widget)
{
GtkAccelGroup *accel_group = gtk_accel_group_new ();
GtkWidget *button;
-
+ GtkWidget *content_area;
+
window = gtk_dialog_new_with_buttons ("Key Lookup", NULL, 0,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
@@ -4079,35 +4097,37 @@ create_key_lookup (GtkWidget *widget)
gtk_window_set_default_size (GTK_WINDOW (window), 300, -1);
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
button = gtk_button_new_with_mnemonic ("Button 1 (_a)");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 2 (_A)");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 3 (_\321\204)");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 4 (_\320\244)");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 6 (_b)");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = accel_button_new (accel_group, "Button 7", "<Alt><Shift>b");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = accel_button_new (accel_group, "Button 8", "<Alt>d");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = accel_button_new (accel_group, "Button 9", "<Alt>Cyrillic_ve");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 10 (_1)");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic ("Button 11 (_!)");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = accel_button_new (accel_group, "Button 12", "<Super>a");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = accel_button_new (accel_group, "Button 13", "<Hyper>a");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = accel_button_new (accel_group, "Button 14", "<Meta>a");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
button = accel_button_new (accel_group, "Button 15", "<Shift><Mod4>b");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
window_ptr = &window;
g_object_add_weak_pointer (G_OBJECT (window), window_ptr);
@@ -4375,6 +4395,7 @@ static void
create_scrolled_windows (GtkWidget *widget)
{
static GtkWidget *window;
+ GtkWidget *content_area, *action_area;
GtkWidget *scrolled_window;
GtkWidget *table;
GtkWidget *button;
@@ -4392,17 +4413,18 @@ create_scrolled_windows (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroyed),
&window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (window));
+
gtk_window_set_title (GTK_WINDOW (window), "dialog");
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
- scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), scrolled_window, TRUE, TRUE, 0);
gtk_widget_show (scrolled_window);
table = gtk_table_new (20, 20, FALSE);
@@ -4431,8 +4453,7 @@ create_scrolled_windows (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroy),
window);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button);
gtk_widget_show (button);
@@ -4441,8 +4462,7 @@ create_scrolled_windows (GtkWidget *widget)
G_CALLBACK (scrolled_windows_remove),
scrolled_window);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button);
gtk_widget_show (button);
@@ -4853,6 +4873,7 @@ static GtkWidget *
create_size_group_window (GdkScreen *screen,
GtkSizeGroup *master_size_group)
{
+ GtkWidget *content_area;
GtkWidget *window;
GtkWidget *table;
GtkWidget *main_button;
@@ -4878,8 +4899,10 @@ create_size_group_window (GdkScreen *screen,
G_CALLBACK (gtk_widget_destroy),
NULL);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
table = gtk_table_new (2, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0);
gtk_table_set_row_spacings (GTK_TABLE (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
@@ -4934,7 +4957,7 @@ create_size_group_window (GdkScreen *screen,
g_object_unref (vgroup2);
hbox = gtk_hbox_new (FALSE, 5);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
spin_button = gtk_spin_button_new_with_range (1, 100, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button), SIZE_GROUP_INITIAL_SIZE);
@@ -5773,7 +5796,12 @@ orientable_toggle_orientation (GtkOrientable *orientable)
void
flipping_orientation_toggled_cb (GtkWidget *widget, gpointer data)
{
- orientable_toggle_orientation (GTK_ORIENTABLE (GTK_DIALOG (gtk_widget_get_toplevel (widget))->vbox));
+ GtkWidget *content_area;
+ GtkWidget *toplevel;
+
+ toplevel = gtk_widget_get_toplevel (widget);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (toplevel));
+ orientable_toggle_orientation (GTK_ORIENTABLE (content_area));
}
static void
@@ -5814,6 +5842,7 @@ create_flipping (GtkWidget *widget)
{
static GtkWidget *window = NULL;
GtkWidget *check_button, *button;
+ GtkWidget *action_area, *content_area;
if (!window)
{
@@ -5826,12 +5855,14 @@ create_flipping (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroyed),
&window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (window));
+
gtk_window_set_title (GTK_WINDOW (window), "Bidirectional Flipping");
check_button = gtk_check_button_new_with_label ("Right-to-left global direction");
gtk_container_set_border_width (GTK_CONTAINER (check_button), 10);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
- check_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE, 0);
if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
@@ -5841,29 +5872,27 @@ create_flipping (GtkWidget *widget)
check_button = gtk_check_button_new_with_label ("Toggle orientation of all boxes");
gtk_container_set_border_width (GTK_CONTAINER (check_button), 10);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
- check_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE, 0);
g_signal_connect (check_button, "toggled",
G_CALLBACK (flipping_orientation_toggled_cb), NULL);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
+ gtk_box_pack_start (GTK_BOX (content_area),
create_forward_back ("Default", GTK_TEXT_DIR_NONE),
TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
+ gtk_box_pack_start (GTK_BOX (content_area),
create_forward_back ("Left-to-Right", GTK_TEXT_DIR_LTR),
TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
+ gtk_box_pack_start (GTK_BOX (content_area),
create_forward_back ("Right-to-Left", GTK_TEXT_DIR_RTL),
TRUE, TRUE, 0);
button = gtk_button_new_with_label ("Close");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy), window);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
}
if (!gtk_widget_get_visible (window))
@@ -5927,6 +5956,7 @@ create_focus (GtkWidget *widget)
if (!window)
{
+ GtkWidget *content_area;
GtkWidget *table;
GtkWidget *frame;
GList *list = NULL;
@@ -5947,13 +5977,14 @@ create_focus (GtkWidget *widget)
g_signal_connect (window, "response",
G_CALLBACK (gtk_widget_destroy),
NULL);
+
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
gtk_window_set_title (GTK_WINDOW (window), "Keyboard Focus Navigation");
frame = gtk_frame_new ("Weird tab focus chain");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
- frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE, 0);
table = make_focus_table (&list);
@@ -5966,8 +5997,7 @@ create_focus (GtkWidget *widget)
frame = gtk_frame_new ("Default tab focus chain");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
- frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE, 0);
list = NULL;
table = make_focus_table (&list);
@@ -6056,7 +6086,7 @@ label_toggle (GtkWidget *widget,
G_CALLBACK (gtk_widget_destroyed),
label);
gtk_misc_set_padding (GTK_MISC (*label), 10, 10);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_window)->vbox),
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog_window))),
*label, TRUE, TRUE, 0);
gtk_widget_show (*label);
}
@@ -6084,6 +6114,7 @@ static void
create_dialog (GtkWidget *widget)
{
static GtkWidget *label;
+ GtkWidget *action_area;
GtkWidget *button;
if (!dialog_window)
@@ -6106,13 +6137,14 @@ create_dialog (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroyed),
&dialog_window);
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog_window));
+
gtk_window_set_title (GTK_WINDOW (dialog_window), "GtkDialog");
gtk_container_set_border_width (GTK_CONTAINER (dialog_window), 0);
button = gtk_button_new_with_label ("OK");
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button);
gtk_widget_show (button);
@@ -6121,8 +6153,7 @@ create_dialog (GtkWidget *widget)
G_CALLBACK (label_toggle),
&label);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_show (button);
label = NULL;
@@ -6355,6 +6386,7 @@ event_watcher_toggle (void)
static void
create_event_watcher (GtkWidget *widget)
{
+ GtkWidget *action_area, *content_area;
GtkWidget *button;
if (!dialog_window)
@@ -6370,6 +6402,9 @@ create_event_watcher (GtkWidget *widget)
G_CALLBACK (event_watcher_down),
NULL);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog_window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog_window));
+
gtk_window_set_title (GTK_WINDOW (dialog_window), "Event Watcher");
gtk_container_set_border_width (GTK_CONTAINER (dialog_window), 0);
gtk_widget_set_size_request (dialog_window, 200, 110);
@@ -6379,8 +6414,7 @@ create_event_watcher (GtkWidget *widget)
G_CALLBACK (event_watcher_toggle),
NULL);
gtk_container_set_border_width (GTK_CONTAINER (button), 10);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_window)->vbox),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, TRUE, TRUE, 0);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Close");
@@ -6388,8 +6422,7 @@ create_event_watcher (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroy),
dialog_window);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button);
gtk_widget_show (button);
}
@@ -8947,6 +8980,7 @@ entry_changed (GtkWidget *widget, ProgressData *pdata)
void
create_progress_bar (GtkWidget *widget)
{
+ GtkWidget *action_area, *content_area;
GtkWidget *button;
GtkWidget *vbox;
GtkWidget *vbox2;
@@ -8988,16 +9022,17 @@ create_progress_bar (GtkWidget *widget)
g_signal_connect (pdata->window, "destroy",
G_CALLBACK (destroy_progress),
&pdata);
-
pdata->timer = 0;
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (pdata->window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (pdata->window));
+
gtk_window_set_title (GTK_WINDOW (pdata->window), "GtkProgressBar");
gtk_container_set_border_width (GTK_CONTAINER (pdata->window), 0);
vbox = gtk_vbox_new (FALSE, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (pdata->window)->vbox),
- vbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, TRUE, 0);
frame = gtk_frame_new ("Progress");
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
@@ -9100,8 +9135,7 @@ create_progress_bar (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroy),
pdata->window);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (pdata->window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button);
}
@@ -9623,6 +9657,7 @@ void
create_selection_test (GtkWidget *widget)
{
static GtkWidget *window = NULL;
+ GtkWidget *action_area, *content_area;
GtkWidget *button;
GtkWidget *vbox;
GtkWidget *scrolled_win;
@@ -9643,6 +9678,9 @@ create_selection_test (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroyed),
&window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (window));
+
gtk_window_set_title (GTK_WINDOW (window), "Selection Test");
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
@@ -9650,8 +9688,7 @@ create_selection_test (GtkWidget *widget)
vbox = gtk_vbox_new (FALSE, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox,
- TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
label = gtk_label_new ("Gets available targets for current selection");
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
@@ -9677,15 +9714,13 @@ create_selection_test (GtkWidget *widget)
/* .. And create some buttons */
button = gtk_button_new_with_label ("Get Targets");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
g_signal_connect (button, "clicked",
G_CALLBACK (selection_test_get_targets), tree_view);
button = gtk_button_new_with_label ("Quit");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
@@ -9775,6 +9810,7 @@ void
create_scroll_test (GtkWidget *widget)
{
static GtkWidget *window = NULL;
+ GtkWidget *action_area, *content_area;
GtkWidget *hbox;
GtkWidget *drawing_area;
GtkWidget *scrollbar;
@@ -9794,12 +9830,14 @@ create_scroll_test (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroyed),
&window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (window));
+
gtk_window_set_title (GTK_WINDOW (window), "Scroll Test");
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
hbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), hbox,
- TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
drawing_area = gtk_drawing_area_new ();
@@ -9830,8 +9868,7 @@ create_scroll_test (GtkWidget *widget)
/* .. And create some buttons */
button = gtk_button_new_with_label ("Quit");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
@@ -9913,6 +9950,7 @@ void
create_timeout_test (GtkWidget *widget)
{
static GtkWidget *window = NULL;
+ GtkWidget *action_area, *content_area;
GtkWidget *button;
GtkWidget *label;
@@ -9927,13 +9965,15 @@ create_timeout_test (GtkWidget *widget)
G_CALLBACK (destroy_timeout_test),
&window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+ action_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
gtk_window_set_title (GTK_WINDOW (window), "Timeout Test");
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
label = gtk_label_new ("count: 0");
gtk_misc_set_padding (GTK_MISC (label), 10, 10);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
- label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0);
gtk_widget_show (label);
button = gtk_button_new_with_label ("close");
@@ -9941,8 +9981,7 @@ create_timeout_test (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroy),
window);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button);
gtk_widget_show (button);
@@ -9951,8 +9990,7 @@ create_timeout_test (GtkWidget *widget)
G_CALLBACK(start_timeout_test),
label);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_show (button);
button = gtk_button_new_with_label ("stop");
@@ -9960,8 +9998,7 @@ create_timeout_test (GtkWidget *widget)
G_CALLBACK (stop_timeout_test),
NULL);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_show (button);
}
@@ -10036,6 +10073,7 @@ create_idle_test (GtkWidget *widget)
if (!window)
{
+ GtkWidget *action_area, *content_area;
GtkWidget *button2;
GtkWidget *frame;
GtkWidget *box;
@@ -10049,6 +10087,9 @@ create_idle_test (GtkWidget *widget)
G_CALLBACK (destroy_idle_test),
&window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (window));
+
gtk_window_set_title (GTK_WINDOW (window), "Idle Test");
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
@@ -10065,15 +10106,14 @@ create_idle_test (GtkWidget *widget)
"child", label,
/* NULL), */
NULL);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox),
- container, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), container, TRUE, TRUE, 0);
frame =
g_object_new (GTK_TYPE_FRAME,
"border_width", 5,
"label", "Label Container",
"visible", TRUE,
- "parent", GTK_DIALOG (window)->vbox,
+ "parent", content_area,
NULL);
box =
g_object_new (GTK_TYPE_VBOX,
@@ -10117,8 +10157,7 @@ create_idle_test (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroy),
window);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button);
gtk_widget_show (button);
@@ -10127,8 +10166,7 @@ create_idle_test (GtkWidget *widget)
G_CALLBACK (start_idle_test),
label);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_show (button);
button = gtk_button_new_with_label ("stop");
@@ -10136,8 +10174,7 @@ create_idle_test (GtkWidget *widget)
G_CALLBACK (stop_idle_test),
NULL);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_show (button);
}
@@ -10175,6 +10212,7 @@ void
create_rc_file (GtkWidget *widget)
{
static GtkWidget *window = NULL;
+ GtkWidget *action_area, *content_area;
GtkWidget *button;
GtkWidget *frame;
GtkWidget *vbox;
@@ -10191,8 +10229,11 @@ create_rc_file (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroyed),
&window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (window));
+
frame = gtk_aspect_frame_new ("Testing RC file prioritization", 0.5, 0.5, 0.0, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), frame, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), vbox);
@@ -10216,24 +10257,21 @@ create_rc_file (GtkWidget *widget)
g_signal_connect (button, "clicked",
G_CALLBACK (gtk_rc_reparse_all), NULL);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_grab_default (button);
button = gtk_button_new_with_label ("Reload All");
g_signal_connect (button, "clicked",
G_CALLBACK (reload_all_rc_files), NULL);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
button = gtk_button_new_with_label ("Close");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
}
if (!gtk_widget_get_visible (window))
@@ -10257,6 +10295,7 @@ void
create_mainloop (GtkWidget *widget)
{
static GtkWidget *window = NULL;
+ GtkWidget *action_area, *content_area;
GtkWidget *label;
GtkWidget *button;
@@ -10273,16 +10312,17 @@ create_mainloop (GtkWidget *widget)
G_CALLBACK (mainloop_destroyed),
&window);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (window));
+
label = gtk_label_new ("In recursive main loop...");
gtk_misc_set_padding (GTK_MISC(label), 20, 20);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), label,
- TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0);
gtk_widget_show (label);
button = gtk_button_new_with_label ("Leave");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button,
- FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, FALSE, TRUE, 0);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
@@ -10420,6 +10460,7 @@ void
create_styles (GtkWidget *widget)
{
static GtkWidget *window = NULL;
+ GtkWidget *content_area, *action_area;
GtkWidget *label;
GtkWidget *button;
GtkWidget *entry;
@@ -10443,19 +10484,20 @@ create_styles (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroyed),
&window);
-
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (window));
+
button = gtk_button_new_with_label ("Close");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
gtk_widget_show (button);
vbox = gtk_vbox_new (FALSE, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE, 0);
label = gtk_label_new ("Font:");
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
diff --git a/tests/testmultidisplay.c b/tests/testmultidisplay.c
index ad96216d2b..9f9552673e 100644
--- a/tests/testmultidisplay.c
+++ b/tests/testmultidisplay.c
@@ -58,6 +58,7 @@ make_selection_dialog (GdkScreen * screen,
GtkWidget * other_entry)
{
GtkWidget *window, *vbox;
+ GtkWidget *content_area;
MyDoubleGtkEntry *double_entry = g_new (MyDoubleGtkEntry, 1);
double_entry->e1 = GTK_ENTRY (entry);
double_entry->e2 = GTK_ENTRY (other_entry);
@@ -74,11 +75,12 @@ make_selection_dialog (GdkScreen * screen,
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_main_quit), NULL);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
vbox = g_object_new (GTK_TYPE_VBOX,
"border_width", 5,
NULL);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
gtk_widget_grab_focus (entry);
@@ -100,6 +102,7 @@ main (int argc, char *argv[])
{
GtkWidget *dialog, *display_entry, *dialog_label;
GtkWidget *entry, *entry2;
+ GtkWidget *content_area;
GdkDisplay *dpy2;
GdkScreen *scr2 = NULL; /* Quiet GCC */
gboolean correct_second_display = FALSE;
@@ -123,9 +126,10 @@ main (int argc, char *argv[])
dialog_label =
gtk_label_new ("Please enter the name of\nthe second display\n");
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog_label);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
- display_entry);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+ gtk_container_add (GTK_CONTAINER (content_area), dialog_label);
+ gtk_container_add (GTK_CONTAINER (content_area), display_entry);
g_signal_connect (dialog, "response",
G_CALLBACK (get_screen_response), display_entry);
diff --git a/tests/testselection.c b/tests/testselection.c
index 3af0c9fd4b..77ac3452bf 100644
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -376,6 +376,7 @@ quit (void)
int
main (int argc, char *argv[])
{
+ GtkWidget *action_area, *content_area;
GtkWidget *dialog;
GtkWidget *button;
GtkWidget *table;
@@ -404,6 +405,9 @@ main (int argc, char *argv[])
g_signal_connect (dialog, "destroy",
G_CALLBACK (quit), NULL);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+
table = gtk_table_new (4, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER(table), 10);
@@ -411,8 +415,7 @@ main (int argc, char *argv[])
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 2, 2);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->vbox),
- table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0);
gtk_widget_show (table);
selection_button = gtk_toggle_button_new_with_label ("Claim Selection");
@@ -454,15 +457,13 @@ main (int argc, char *argv[])
/* .. And create some buttons */
button = gtk_button_new_with_label ("Paste");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
g_signal_connect (button, "clicked",
G_CALLBACK (paste), entry);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Quit");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area),
- button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy), dialog);
diff --git a/tests/teststatusicon.c b/tests/teststatusicon.c
index 4829bf0d0a..942a4a54c9 100755
--- a/tests/teststatusicon.c
+++ b/tests/teststatusicon.c
@@ -143,6 +143,7 @@ timeout_toggle_toggled (GtkToggleButton *toggle)
static void
icon_activated (GtkStatusIcon *icon)
{
+ GtkWidget *content_area;
GtkWidget *dialog;
GtkWidget *toggle;
@@ -165,8 +166,10 @@ icon_activated (GtkStatusIcon *icon)
g_signal_connect (dialog, "delete_event",
G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
toggle = gtk_toggle_button_new_with_mnemonic ("_Show the icon");
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), toggle, TRUE, TRUE, 6);
+ gtk_box_pack_end (GTK_BOX (content_area), toggle, TRUE, TRUE, 6);
gtk_widget_show (toggle);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
@@ -175,7 +178,7 @@ icon_activated (GtkStatusIcon *icon)
G_CALLBACK (visible_toggle_toggled), NULL);
toggle = gtk_toggle_button_new_with_mnemonic ("_Blink the icon");
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), toggle, TRUE, TRUE, 6);
+ gtk_box_pack_end (GTK_BOX (content_area), toggle, TRUE, TRUE, 6);
gtk_widget_show (toggle);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
@@ -184,7 +187,7 @@ icon_activated (GtkStatusIcon *icon)
G_CALLBACK (blink_toggle_toggled), NULL);
toggle = gtk_toggle_button_new_with_mnemonic ("_Change images");
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), toggle, TRUE, TRUE, 6);
+ gtk_box_pack_end (GTK_BOX (content_area), toggle, TRUE, TRUE, 6);
gtk_widget_show (toggle);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),