stylecontext: Do invalidation on first resize container

[~andy/gtk] / tests / testtreeedit.c

diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index 8e0cc326825d92ee1654f9761cc1cb8c639094bd..c0940282180170bda3c96cdefaf9798316b181cf 100644 (file)
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -42,6 +40,7 @@ static ListEntry model_strings[] =
 {
   {"A simple string", TRUE, TRUE, 0 },
   {"Another string!", TRUE, TRUE, 10 },
+  {"", TRUE, TRUE, 0 },
   {"Guess what, a third string. This one can't be edited", FALSE, TRUE, 47 },
   {"And then a fourth string. Neither can this", FALSE, TRUE, 48 },
   {"Multiline\nFun!", TRUE, FALSE, 75 },
@@ -247,7 +246,7 @@ main (gint argc, gchar **argv)
   gtk_window_set_title (GTK_WINDOW (window), "GtkTreeView editing sample");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -287,6 +286,9 @@ main (gint argc, gchar **argv)
   callback[1].renderer = renderer;
   g_signal_connect (renderer, "edited",
                    G_CALLBACK (edited), tree_model);
+  g_object_set (renderer,
+                "placeholder-text", "Type here",
+                NULL);
 
   renderer = gtk_cell_renderer_text_new ();
   gtk_tree_view_column_pack_start (column, renderer, FALSE);
@@ -299,6 +301,9 @@ main (gint argc, gchar **argv)
   callback[2].renderer = renderer;
   g_signal_connect (renderer, "edited",
                    G_CALLBACK (edited), tree_model);
+  g_object_set (renderer,
+                "placeholder-text", "Type here too",
+                NULL);
 
   renderer = gtk_cell_renderer_pixbuf_new ();
   g_object_set (renderer,
@@ -352,12 +357,12 @@ main (gint argc, gchar **argv)
   gtk_window_set_default_size (GTK_WINDOW (window),
                               800, 250);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_widget_show (hbox);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
   /* Alignment controls */
-  cntl_vbox = gtk_vbox_new (FALSE, 2);
+  cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_widget_show (cntl_vbox);
   gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE, 0);
 
@@ -367,7 +372,7 @@ main (gint argc, gchar **argv)
   create_control (cntl_vbox, 4, CNTL_ALIGN, &callback[3]);
 
   /* Expand controls */
-  cntl_vbox = gtk_vbox_new (FALSE, 2);
+  cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_widget_show (cntl_vbox);
   gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE, 0);
 
@@ -377,7 +382,7 @@ main (gint argc, gchar **argv)
   create_control (cntl_vbox, 4, CNTL_EXPAND, &callback[3]);
 
   /* Fixed controls */
-  cntl_vbox = gtk_vbox_new (FALSE, 2);
+  cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_widget_show (cntl_vbox);
   gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE, 0);