diff options
| author | Martin Wimpress <[email protected]> | 2017-01-18 14:39:59 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-01-18 14:39:59 +0000 |
| commit | 00b0f944837025b61bdffd893d4614ed1d5e7dde (patch) | |
| tree | 41a3450d67f77f98b4b70392eec923ea54013cc0 /src/gs-window.h | |
| parent | 2197434c213600c42b264602c4331eac7761db11 (diff) | |
| parent | 5d4416aa5853de486e62ca97207ee1da4b35b199 (diff) | |
| download | mate-screensaver-00b0f944837025b61bdffd893d4614ed1d5e7dde.tar.bz2 mate-screensaver-00b0f944837025b61bdffd893d4614ed1d5e7dde.tar.xz | |
Merge pull request #110 from XRevan86/master
Avoid deprecated gdk_window_set_background functions
Diffstat (limited to 'src/gs-window.h')
| -rw-r--r-- | src/gs-window.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/gs-window.h b/src/gs-window.h index 9cd64eb..7878a94 100644 --- a/src/gs-window.h +++ b/src/gs-window.h @@ -59,12 +59,16 @@ GType gs_window_get_type (void); gboolean gs_window_is_obscured (GSWindow *window); gboolean gs_window_is_dialog_up (GSWindow *window); -void gs_window_set_screen (GSWindow *window, - GdkScreen *screen); -GdkScreen * gs_window_get_screen (GSWindow *window); -void gs_window_set_monitor (GSWindow *window, - int monitor); +GdkDisplay * gs_window_get_display (GSWindow *window); +#if GTK_CHECK_VERSION (3, 22, 0) +void gs_window_set_monitor (GSWindow *window, + GdkMonitor *monitor); +GdkMonitor * gs_window_get_monitor (GSWindow *window); +#else +void gs_window_set_monitor (GSWindow *window, + int monitor); int gs_window_get_monitor (GSWindow *window); +#endif void gs_window_set_background_surface (GSWindow *window, cairo_surface_t *surface); @@ -92,9 +96,13 @@ void gs_window_show_message (GSWindow *window, void gs_window_request_unlock (GSWindow *window); void gs_window_cancel_unlock_request (GSWindow *window); -GSWindow * gs_window_new (GdkScreen *screen, - int monitor, - gboolean lock_enabled); +GSWindow * gs_window_new (GdkDisplay *display, +#if GTK_CHECK_VERSION (3, 22, 0) + GdkMonitor *monitor, +#else + int monitor, +#endif + gboolean lock_enabled); void gs_window_show (GSWindow *window); void gs_window_destroy (GSWindow *window); GdkWindow * gs_window_get_gdk_window (GSWindow *window); |