callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Port testsocket example to not use deprecated APIs

Browse Source
This commit is contained in:
Benjamin Otte
2011-01-05 23:49:40 +01:00
parent 8136481d75
commit 2e064b3378
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/testsocket.c
View File

@ -281,13 +281,22 @@ static void
grab_window_toggled (GtkToggleButton *button, grab_window_toggled (GtkToggleButton *button,
GtkWidget *widget) GtkWidget *widget)
{ {
GdkDevice *device = gtk_get_current_event_device ();
if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD)
device = gdk_device_get_associated_device (device);
if (gtk_toggle_button_get_active (button)) if (gtk_toggle_button_get_active (button))
{ {
int status; int status;
status = gdk_keyboard_grab (gtk_widget_get_window (widget), status = gdk_device_grab (device,
FALSE, GDK_CURRENT_TIME); gtk_widget_get_window (widget),
GDK_OWNERSHIP_NONE,
FALSE,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL,
GDK_CURRENT_TIME);
if (status != GDK_GRAB_SUCCESS) if (status != GDK_GRAB_SUCCESS)
g_warning ("Could not grab keyboard! (%s)", grab_string (status)); g_warning ("Could not grab keyboard! (%s)", grab_string (status));
@ -295,7 +304,7 @@ grab_window_toggled (GtkToggleButton *button,
} }
else else
{ {
gdk_keyboard_ungrab (GDK_CURRENT_TIME); gdk_device_ungrab (device, GDK_CURRENT_TIME);
} }
} }