Use gtk_box_new() instead gtk_[v|h]box_new()

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

diff --git a/tests/testtext.c b/tests/testtext.c
index 36247df711c1159b0c3e494a4f5507e268bc6e1d..84159822ca1a92c7c131b936df7584836e32ad51 100644 (file)
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -25,8 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -195,14 +193,14 @@ static void
 msgbox_yes_cb (GtkWidget *widget, gboolean *result)
 {
   *result = 0;
-  gtk_object_destroy (GTK_OBJECT (gtk_widget_get_toplevel (widget)));
+  gtk_widget_destroy (gtk_widget_get_toplevel (widget));
 }
 
 static void
 msgbox_no_cb (GtkWidget *widget, gboolean *result)
 {
   *result = 1;
-  gtk_object_destroy (GTK_OBJECT (gtk_widget_get_toplevel (widget)));
+  gtk_widget_destroy (gtk_widget_get_toplevel (widget));
 }
 
 static gboolean
@@ -211,7 +209,7 @@ msgbox_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
   if (event->keyval == GDK_Escape)
     {
       g_signal_stop_emission_by_name (widget, "key_press_event");
-      gtk_object_destroy (GTK_OBJECT (widget));
+      gtk_widget_destroy (widget);
       return TRUE;
     }
 
@@ -263,7 +261,7 @@ msgbox_run (GtkWindow  *parent,
 
   /* Fill in the contents of the widget
    */
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (dialog), vbox);
   
   label = gtk_label_new (message);
@@ -271,10 +269,10 @@ msgbox_run (GtkWindow  *parent,
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
 
-  separator = gtk_hseparator_new ();
+  separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0);
 
-  button_box = gtk_hbutton_box_new ();
+  button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (button_box), 8);
   
@@ -472,7 +470,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
   tag = gtk_text_buffer_create_tag (buffer, "fg_blue", NULL);
 
 #ifdef DO_BLINK
-  gtk_timeout_add (1000, blink_timeout, tag);
+  g_timeout_add (1000, (GSourceFunc)blink_timeout, tag);
 #endif     
  
   setup_tag (tag);
@@ -1536,7 +1534,7 @@ do_rich_text (gpointer callback_data,
 
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), tv);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
                       FALSE, FALSE, 0);
 
@@ -2864,7 +2862,7 @@ line_numbers_expose (GtkWidget      *widget,
 
       gtk_paint_layout (widget->style,
                         target,
-                        GTK_WIDGET_STATE (widget),
+                        gtk_widget_get_state (widget),
                         FALSE,
                         NULL,
                         widget,
@@ -2930,7 +2928,7 @@ create_view (Buffer *buffer)
 
   gtk_window_add_accel_group (GTK_WINDOW (view->window), view->accel_group);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (view->window), vbox);
 
   gtk_box_pack_start (GTK_BOX (vbox),
@@ -3033,8 +3031,8 @@ test_init (void)
   if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
                   G_FILE_TEST_EXISTS))
     {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/gtk.immodules", TRUE);
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
     }
 }