diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-07-20 14:07:44 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-07-20 14:07:44 +0000 |
| commit | fa77925da2696b5b5463f62d5ed85913df0499cb (patch) | |
| tree | 28b0e3d811598361ef8f44c91c5ad7fbef7ea216 | |
| parent | 172dc3e79a05581793413954bb11803c12e41f9c (diff) | |
| parent | db7f0853159fdfb639afe4bfdaba6e938e74cc5a (diff) | |
| download | gtk+-fa77925da2696b5b5463f62d5ed85913df0499cb.tar.gz | |
Merge branch 'gtk-3-24' into 'gtk-3-24'
Remove deprecated functions
See merge request GNOME/gtk!255
| -rw-r--r-- | demos/gtk-demo/changedisplay.c | 2 | ||||
| -rw-r--r-- | modules/input/gtkimcontextthai.c | 3 | ||||
| -rw-r--r-- | tests/animated-resizing.c | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c index 37c364f3e8..fcb16090fe 100644 --- a/demos/gtk-demo/changedisplay.c +++ b/demos/gtk-demo/changedisplay.c @@ -151,7 +151,7 @@ query_for_toplevel (GdkScreen *screen, g_object_unref (cursor); gtk_widget_destroy (popup); - gdk_flush (); /* Really release the grab */ + gdk_display_flush (display); /* Really release the grab */ return toplevel; } diff --git a/modules/input/gtkimcontextthai.c b/modules/input/gtkimcontextthai.c index 73510c0360..c3ebc83be5 100644 --- a/modules/input/gtkimcontextthai.c +++ b/modules/input/gtkimcontextthai.c @@ -336,7 +336,8 @@ gtk_im_context_thai_filter_keypress (GtkIMContext *context, if (is_reject) { /* reject character */ - gdk_beep (); + GdkDisplay *display = gdk_display_get_default (); + gdk_display_beep (display); } return TRUE; } diff --git a/tests/animated-resizing.c b/tests/animated-resizing.c index 8660089276..d11d6e0dee 100644 --- a/tests/animated-resizing.c +++ b/tests/animated-resizing.c @@ -168,7 +168,7 @@ int main(int argc, char **argv) { GError *error = NULL; - GdkScreen *screen; + GdkMonitor *monitor; GdkRectangle monitor_bounds; GOptionContext *context = g_option_context_new (NULL); @@ -204,10 +204,8 @@ main(int argc, char **argv) G_CALLBACK (on_map_event), NULL); on_frame (0.); - screen = gtk_widget_get_screen (window); - gdk_screen_get_monitor_geometry (screen, - gdk_screen_get_primary_monitor (screen), - &monitor_bounds); + monitor = gdk_display_get_primary_monitor (gtk_widget_get_display (window)); + gdk_monitor_get_geometry (monitor, &monitor_bounds); gtk_window_move (GTK_WINDOW (window), monitor_bounds.x + (monitor_bounds.width - window_width) / 2, |