Mercurial > vim
comparison src/gui_beval.c @ 12409:2c020bc30f62 v8.0.1084
patch 8.0.1084: GTK build has compiler warnings
commit https://github.com/vim/vim/commit/7be9b50fd7e238722c9ba5c0ef1d2a7e7e52b9e3
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 9 18:45:26 2017 +0200
patch 8.0.1084: GTK build has compiler warnings
Problem: GTK build has compiler warnings. (Christian Brabandt)
Solution: Get screen size with a different function. (Ken Takata, Yasuhiro
Matsumoto)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 09 Sep 2017 19:00:04 +0200 |
parents | 621e41f6dcc2 |
children | 68d7bc045dbe |
comparison
equal
deleted
inserted
replaced
12408:587fc0ce700e | 12409:2c020bc30f62 |
---|---|
1175 int x; | 1175 int x; |
1176 int y; | 1176 int y; |
1177 int x_offset = EVAL_OFFSET_X; | 1177 int x_offset = EVAL_OFFSET_X; |
1178 int y_offset = EVAL_OFFSET_Y; | 1178 int y_offset = EVAL_OFFSET_Y; |
1179 PangoLayout *layout; | 1179 PangoLayout *layout; |
1180 # if GTK_CHECK_VERSION(3,22,2) | 1180 |
1181 GdkRectangle rect; | 1181 # if !GTK_CHECK_VERSION(3,22,2) |
1182 GdkMonitor * const mon = gdk_display_get_monitor_at_window( | |
1183 gtk_widget_get_display(beval->balloonShell), | |
1184 gtk_widget_get_window(beval->balloonShell)); | |
1185 gdk_monitor_get_geometry(mon, &rect); | |
1186 | |
1187 screen_w = rect.width; | |
1188 screen_h = rect.height; | |
1189 # else | |
1190 GdkScreen *screen; | 1182 GdkScreen *screen; |
1191 | 1183 |
1192 screen = gtk_widget_get_screen(beval->target); | 1184 screen = gtk_widget_get_screen(beval->target); |
1193 gtk_window_set_screen(GTK_WINDOW(beval->balloonShell), screen); | 1185 gtk_window_set_screen(GTK_WINDOW(beval->balloonShell), screen); |
1194 screen_w = gdk_screen_get_width(screen); | 1186 # endif |
1195 screen_h = gdk_screen_get_height(screen); | 1187 gui_gtk_get_screen_size_of_win(beval->balloonShell, |
1196 # endif | 1188 &screen_w, &screen_h); |
1197 # if !GTK_CHECK_VERSION(3,0,0) | 1189 # if !GTK_CHECK_VERSION(3,0,0) |
1198 gtk_widget_ensure_style(beval->balloonShell); | 1190 gtk_widget_ensure_style(beval->balloonShell); |
1199 gtk_widget_ensure_style(beval->balloonLabel); | 1191 gtk_widget_ensure_style(beval->balloonLabel); |
1200 # endif | 1192 # endif |
1201 | 1193 |