diff options
| author | Paolo Borelli <pborelli@gnome.org> | 2015-12-18 00:36:57 +0100 |
|---|---|---|
| committer | Ignacio Casal Quinteiro <icq@gnome.org> | 2016-01-14 14:30:37 +0100 |
| commit | 3cd79c11fcd14daf1058077e58a5ff154e09b06c (patch) | |
| tree | 8c2d4f53e45c939ca0bd0945c4ddebd659f8802b /gdk/win32/gdkdevice-wintab.c | |
| parent | e44b42061737ec4f6dbdad8f1a6dc2d53ea3dd02 (diff) | |
| download | gtk+-3cd79c11fcd14daf1058077e58a5ff154e09b06c.tar.gz | |
win32: remove _gdk_root global variable
Diffstat (limited to 'gdk/win32/gdkdevice-wintab.c')
| -rw-r--r-- | gdk/win32/gdkdevice-wintab.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c index e411bfd28d..585a6f1f70 100644 --- a/gdk/win32/gdkdevice-wintab.c +++ b/gdk/win32/gdkdevice-wintab.c @@ -184,10 +184,12 @@ gdk_device_wintab_query_state (GdkDevice *device, GdkModifierType *mask) { GdkDeviceWintab *device_wintab; + GdkScreen *screen; POINT point; HWND hwnd, hwndc; device_wintab = GDK_DEVICE_WINTAB (device); + screen = gdk_window_get_screen (window); hwnd = GDK_WINDOW_HWND (window); GetCursorPos (&point); @@ -206,7 +208,7 @@ gdk_device_wintab_query_state (GdkDevice *device, if (win_y) *win_y = point.y; - if (window == _gdk_root) + if (window == gdk_get_default_root_window ()) { if (win_x) *win_x += _gdk_offset_x; @@ -226,12 +228,7 @@ gdk_device_wintab_query_state (GdkDevice *device, } if (root_window) - { - GdkScreen *screen; - - screen = gdk_window_get_screen (window); - *root_window = gdk_screen_get_root_window (screen); - } + *root_window = gdk_screen_get_root_window (screen); if (mask) { |