diff options
| author | Jan Djärv | 2012-07-06 17:02:29 +0200 |
|---|---|---|
| committer | Jan Djärv | 2012-07-06 17:02:29 +0200 |
| commit | bdd091e45b38fbbf4fc1fe8ab6b0674f7194d28d (patch) | |
| tree | e0547c1cb19c51cc28a7eb36f943fc9a2c3466dd /src | |
| parent | 9d44f8ce16669f862eb901435593193c54ac09dd (diff) | |
| download | emacs-bdd091e45b38fbbf4fc1fe8ab6b0674f7194d28d.tar.gz emacs-bdd091e45b38fbbf4fc1fe8ab6b0674f7194d28d.zip | |
* gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3 is defined.
Fixes: debbugs:11768
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cfc4a00512f..e80d4f322e9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-07-06 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3 | ||
| 4 | is defined (Bug#11768). | ||
| 5 | |||
| 1 | 2012-07-06 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2012-07-06 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Fix marker debugging code. | 8 | Fix marker debugging code. |
| @@ -122,7 +127,7 @@ | |||
| 122 | (xg_event_is_for_scrollbar): Use Gdk Device functions for HAVE_GTK3. | 127 | (xg_event_is_for_scrollbar): Use Gdk Device functions for HAVE_GTK3. |
| 123 | (is_box_type): New function (Bug#11768). | 128 | (is_box_type): New function (Bug#11768). |
| 124 | (xg_tool_item_stale_p): Call is_box_type. | 129 | (xg_tool_item_stale_p): Call is_box_type. |
| 125 | (xg_initialize): Get settings by calling gtk_settings_get_for_screen | 130 | (xg_initialize): Get settings by calli<g gtk_settings_get_for_screen |
| 126 | with default display (Bug#11768). | 131 | with default display (Bug#11768). |
| 127 | 132 | ||
| 128 | 2012-07-05 Eli Zaretskii <eliz@gnu.org> | 133 | 2012-07-05 Eli Zaretskii <eliz@gnu.org> |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 82c7d643551..f4551b4b9f7 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -3730,7 +3730,7 @@ xg_event_is_for_scrollbar (FRAME_PTR f, XEvent *event) | |||
| 3730 | #ifdef HAVE_GTK3 | 3730 | #ifdef HAVE_GTK3 |
| 3731 | GdkDevice *gdev = gdk_device_manager_get_client_pointer | 3731 | GdkDevice *gdev = gdk_device_manager_get_client_pointer |
| 3732 | (gdk_display_get_device_manager (gdpy)); | 3732 | (gdk_display_get_device_manager (gdpy)); |
| 3733 | gdk_device_get_window_at_position (gdev, NULL, NULL); | 3733 | gwin = gdk_device_get_window_at_position (gdev, NULL, NULL); |
| 3734 | #else | 3734 | #else |
| 3735 | gwin = gdk_display_get_window_at_pointer (gdpy, NULL, NULL); | 3735 | gwin = gdk_display_get_window_at_pointer (gdpy, NULL, NULL); |
| 3736 | #endif | 3736 | #endif |