label: Remove "line" from wrap properties

The property names are "wrap" and "wrap-mode", so it doesn't make sense
that the accessors refer to line_wrap and line_wrap_mode.

8 files changed, 16 insertions, 16 deletions

diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index 40e5e22cc2..7bcb86215f 100644
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -46,7 +46,7 @@ create_label (gboolean wrap)
   widget = gtk_label_new ("This is a label, label label label");
 
   if (wrap)
-    gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+    gtk_label_set_wrap (GTK_LABEL (widget), TRUE);
 
   return widget;
 }
@@ -328,7 +328,7 @@ open_valigned_label_window (void)
   gtk_container_add (GTK_CONTAINER (box), label);
 
   label = gtk_label_new ("Some wrapping text with width-chars = 15 and max-width-chars = 35");
-  gtk_label_set_line_wrap  (GTK_LABEL (label), TRUE);
+  gtk_label_set_wrap  (GTK_LABEL (label), TRUE);
   gtk_label_set_width_chars  (GTK_LABEL (label), 15);
   gtk_label_set_max_width_chars  (GTK_LABEL (label), 35);
 
diff --git a/tests/testcellarea.c b/tests/testcellarea.c
index 4f78f45475..e4d9f19cec 100644
--- a/tests/testcellarea.c
+++ b/tests/testcellarea.c
@@ -524,8 +524,8 @@ background_area (void)
   label = gtk_label_new ("In this example, row spacing gets devided into the background area, "
 			 "column spacing is added between each background area, item_padding is "
 			 "prepended space distributed to the background area.");
-  gtk_label_set_line_wrap  (GTK_LABEL (label), TRUE);
-  gtk_label_set_width_chars  (GTK_LABEL (label), 40);
+  gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_width_chars (GTK_LABEL (label), 40);
   gtk_container_add (GTK_CONTAINER (main_vbox), label);
 
   iconview = focus_iconview (TRUE, NULL, NULL);
diff --git a/tests/testclipboard2.c b/tests/testclipboard2.c
index 86c0e5dc3f..035afd6b1a 100644
--- a/tests/testclipboard2.c
+++ b/tests/testclipboard2.c
@@ -202,7 +202,7 @@ get_contents_widget (GdkClipboard *clipboard)
   gtk_stack_add_titled (GTK_STACK (stack), child, "image", "Image");
 
   child = gtk_label_new (NULL);
-  gtk_label_set_line_wrap (GTK_LABEL (child), TRUE);
+  gtk_label_set_wrap (GTK_LABEL (child), TRUE);
   gtk_stack_add_titled (GTK_STACK (stack), child, "text", "Text");
 
   return stack;
diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index 980627a9ea..f1e8415aeb 100644
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -147,8 +147,8 @@ populate_flowbox_wrappy (GtkFlowBox *flowbox)
 
       gtk_container_add (GTK_CONTAINER (frame), widget);
 
-      gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-      gtk_label_set_line_wrap_mode (GTK_LABEL (widget), PANGO_WRAP_WORD);
+      gtk_label_set_wrap (GTK_LABEL (widget), TRUE);
+      gtk_label_set_wrap_mode (GTK_LABEL (widget), PANGO_WRAP_WORD);
       gtk_label_set_width_chars (GTK_LABEL (widget), 10);
       g_object_set_data_full (G_OBJECT (frame), "id", (gpointer)g_strdup (strings[i]), g_free);
 
diff --git a/tests/testgrid.c b/tests/testgrid.c
index a2f85666ac..4b63268895 100644
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -114,7 +114,7 @@ text_grid (void)
 
   label = gtk_label_new ("Some text that may wrap if it has to");
   gtk_label_set_width_chars (GTK_LABEL (label), 10);
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_wrap (GTK_LABEL (label), TRUE);
   gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
 
   gtk_grid_attach (GTK_GRID (grid), test_widget ("1", "red"), 1, 0, 1, 1);
@@ -158,7 +158,7 @@ box_comparison (void)
   gtk_container_add (GTK_CONTAINER (box), test_widget ("2", "green"));
 
   label = gtk_label_new ("Some text that may wrap if needed");
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_wrap (GTK_LABEL (label), TRUE);
   gtk_label_set_width_chars (GTK_LABEL (label), 10);
   gtk_container_add (GTK_CONTAINER (box), label);
 
@@ -180,7 +180,7 @@ box_comparison (void)
   gtk_grid_attach (GTK_GRID (grid), test_widget ("2", "green"), 2, 0, 1, 1);
 
   label = gtk_label_new ("Some text that may wrap if needed");
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_wrap (GTK_LABEL (label), TRUE);
   gtk_label_set_width_chars (GTK_LABEL (label), 10);
   gtk_grid_attach (GTK_GRID (grid), label, 3, 0, 1, 1);
   gtk_widget_set_hexpand (label, TRUE);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 3f6a5b17fb..ad78076865 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+  /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -1023,7 +1023,7 @@ void create_labels (GtkWidget *widget)
 			     "     It supports multiple paragraphs correctly, and  correctly   adds "\
 			     "many          extra  spaces. ");
 
-      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_container_add (GTK_CONTAINER (frame), label);
       gtk_container_add (GTK_CONTAINER (vbox), frame);
 
@@ -1036,7 +1036,7 @@ void create_labels (GtkWidget *widget)
 			     "    This is another newer, longer, better paragraph.  It is coming to an end, "\
 			     "unfortunately.");
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_FILL);
-      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_container_add (GTK_CONTAINER (frame), label);
       gtk_container_add (GTK_CONTAINER (vbox), frame);
 
@@ -4916,7 +4916,7 @@ tracking_label (GtkWidget *window)
 			   G_CONNECT_SWAPPED);
 
   label = gtk_label_new ("<no window state events received>");
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_wrap (GTK_LABEL (label), TRUE);
   gtk_container_add (GTK_CONTAINER (hbox), label);
 
   g_object_set_data (G_OBJECT (label), "title", (gpointer)gtk_window_get_title (GTK_WINDOW (window)));
diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index 4bfbbcd8e7..417f172217 100644
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -112,7 +112,7 @@ scrollable_policy (void)
 			 "is enough height to fit the content vertically if the window were "
 			 "to be allocated a width without a vscrollbar present");
 
-  gtk_label_set_line_wrap  (GTK_LABEL (label), TRUE);
+  gtk_label_set_wrap (GTK_LABEL (label), TRUE);
   gtk_label_set_width_chars  (GTK_LABEL (label), 40);
   gtk_label_set_max_width_chars  (GTK_LABEL (label), 100);
 
diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index ef8a5ddc31..e5fb876906 100644
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -49,7 +49,7 @@ show_dialog (void)
                          "mi eu ipsum vestibulum in venenatis enim commodo. "
                          "Vivamus non malesuada ligula.");
 
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_label_set_wrap (GTK_LABEL (label), TRUE);
   gtk_label_set_width_chars (GTK_LABEL (label), width_chars);
   gtk_label_set_max_width_chars (GTK_LABEL (label), max_width_chars);
   gtk_window_set_default_size (GTK_WINDOW (dialog), default_width, default_height);