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

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

diff --git a/tests/testsocket.c b/tests/testsocket.c
index 1493215b3b274906b0efd8e3371b234f0dffcbdb..3b44fd0bb8206c1ce2d6524b72246ae2b38083a0 100644 (file)
--- a/tests/testsocket.c
+++ b/tests/testsocket.c
@@ -19,8 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "config.h"
 #include <gtk/gtk.h>
 
@@ -99,7 +97,7 @@ create_socket (void)
   
   Socket *socket = g_new (Socket, 1);
   
-  socket->box = gtk_vbox_new (FALSE, 0);
+  socket->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 
   socket->socket = gtk_socket_new ();
   
@@ -288,7 +286,8 @@ grab_window_toggled (GtkToggleButton *button,
     {
       int status;
 
-      status = gdk_keyboard_grab (widget->window, FALSE, GDK_CURRENT_TIME);
+      status = gdk_keyboard_grab (gtk_widget_get_window (widget),
+                                  FALSE, GDK_CURRENT_TIME);
 
       if (status != GDK_GRAB_SUCCESS)
        g_warning ("Could not grab keyboard!  (%s)", grab_string (status));
@@ -322,17 +321,18 @@ main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (window), "Socket Test");
   gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   menubar = gtk_menu_bar_new ();
   menuitem = gtk_menu_item_new_with_mnemonic ("_File");
+  gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+
   menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
   menuitem = gtk_menu_item_new_with_mnemonic ("_Quit");
-  g_signal_connect (menuitem, "clicked", G_CALLBACK (quit_cb), window);
+  g_signal_connect (menuitem, "activate", G_CALLBACK (quit_cb), window);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
 
   accel_group = gtk_accel_group_new ();
   gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
@@ -375,13 +375,13 @@ main (int argc, char *argv[])
                    G_CALLBACK (grab_window_toggled),
                    window);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
   entry = gtk_entry_new ();
   gtk_box_pack_start (GTK_BOX(hbox), entry, FALSE, FALSE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
   box = hbox;