diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /tests/testsocket.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'tests/testsocket.c')
| -rw-r--r-- | tests/testsocket.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/testsocket.c b/tests/testsocket.c index 103b965805..b8310fce64 100644 --- a/tests/testsocket.c +++ b/tests/testsocket.c @@ -286,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)); @@ -325,12 +326,13 @@ main (int argc, char *argv[]) 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); - 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); |