stylecontext: Do invalidation on first resize container

[~andy/gtk] / tests / print-editor.c

diff --git a/tests/print-editor.c b/tests/print-editor.c
index 228c19582b4100a88c21e4a7a1cad0f514416f02..e8399ceb6dc2d028c039d00212a2b2439d896d41 100644 (file)
--- a/tests/print-editor.c
+++ b/tests/print-editor.c
@@ -399,10 +399,10 @@ create_custom_widget (GtkPrintOperation *operation,
   GtkWidget *vbox, *hbox, *font, *label;
 
   gtk_print_operation_set_custom_tab_label (operation, "Other");
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -549,7 +549,6 @@ preview_cb (GtkPrintOperation        *op,
            GtkWindow                *parent,
            gpointer                  data)
 {
-  GtkPrintSettings *settings;
   GtkWidget *window, *close, *page, *hbox, *vbox, *da;
   gdouble width, height;
   cairo_t *cr;
@@ -559,16 +558,15 @@ preview_cb (GtkPrintOperation        *op,
   pop = g_new0 (PreviewOp, 1);
 
   pop->data = print_data;
-  settings = gtk_print_operation_get_print_settings (op);
 
   width = 200;
   height = 300;
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_transient_for (GTK_WINDOW (window), 
                                GTK_WINDOW (main_window));
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox,
                      FALSE, FALSE, 0);
   page = gtk_spin_button_new_with_range (1, 100, 1);
@@ -824,7 +822,7 @@ static void
 create_window (void)
 {
   GtkWidget *bar;
-  GtkWidget *table;
+  GtkWidget *box;
   GtkWidget *contents;
   GtkUIManager *ui;
   GtkWidget *sw;
@@ -860,17 +858,12 @@ create_window (void)
       g_error_free (error);
     }
 
-  table = gtk_table_new (1, 3, FALSE);
-  gtk_container_add (GTK_CONTAINER (main_window), table);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (main_window), box);
 
   bar = gtk_ui_manager_get_widget (ui, "/MenuBar");
   gtk_widget_show (bar);
-  gtk_table_attach (GTK_TABLE (table),
-                   bar, 
-                   /* X direction */          /* Y direction */
-                   0, 1,                      0, 1,
-                   GTK_EXPAND | GTK_FILL,     0,
-                   0,                         0);
+  gtk_container_add (GTK_CONTAINER (box), bar);
 
   /* Create document  */
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -882,12 +875,8 @@ create_window (void)
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
                                       GTK_SHADOW_IN);
   
-  gtk_table_attach (GTK_TABLE (table),
-                   sw,
-                   /* X direction */       /* Y direction */
-                   0, 1,                   1, 2,
-                   GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
-                   0,                      0);
+  gtk_widget_set_vexpand (sw, TRUE);
+  gtk_container_add (GTK_CONTAINER (box), sw);
   
   contents = gtk_text_view_new ();
   gtk_widget_grab_focus (contents);
@@ -898,12 +887,7 @@ create_window (void)
   /* Create statusbar */
   
   statusbar = gtk_statusbar_new ();
-  gtk_table_attach (GTK_TABLE (table),
-                   statusbar,
-                   /* X direction */       /* Y direction */
-                   0, 1,                   2, 3,
-                   GTK_EXPAND | GTK_FILL,  0,
-                   0,                      0);
+  gtk_container_add (GTK_CONTAINER (box), statusbar);
 
   /* Show text widget info in the statusbar */
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));