* Boston, MA 02111-1307, USA.
*/
-#undef GTK_DISABLE_DEPRECATED
-
#include "config.h"
#include <gtk/gtk.h>
gtk_widget_destroy (message_dialog);
}
-static GtkItemFactoryEntry menu_items[] =
-{
- { "/_File", NULL, NULL, 0, "<Branch>" },
- { "/File/_Quit", "<control>Q", quit_cb, 0 },
-};
-
static void
socket_destroyed (GtkWidget *widget,
Socket *socket)
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 ();
{
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));
GtkWidget *button;
GtkWidget *hbox;
GtkWidget *vbox;
+ GtkWidget *menubar;
+ GtkWidget *menuitem;
+ GtkWidget *menu;
GtkWidget *entry;
GtkWidget *checkbutton;
GtkAccelGroup *accel_group;
- GtkItemFactory *item_factory;
gtk_init (&argc, &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, "activate", G_CALLBACK (quit_cb), window);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
accel_group = gtk_accel_group_new ();
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
- item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
-
-
- gtk_item_factory_create_items (item_factory,
- G_N_ELEMENTS (menu_items), menu_items,
- NULL);
-
- gtk_box_pack_start (GTK_BOX (vbox),
- gtk_item_factory_get_widget (item_factory, "<main>"),
- FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Add Active Child");
gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE, 0);
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;