Merge branch 'gtk-3-24' into 'gtk-3-24'

Remove deprecated functions

See merge request GNOME/gtk!255
This commit is contained in:
Matthias Clasen 2018-07-20 14:07:44 +00:00
commit fa77925da2
3 changed files with 6 additions and 7 deletions

View File

@ -151,7 +151,7 @@ query_for_toplevel (GdkScreen *screen,
g_object_unref (cursor); g_object_unref (cursor);
gtk_widget_destroy (popup); gtk_widget_destroy (popup);
gdk_flush (); /* Really release the grab */ gdk_display_flush (display); /* Really release the grab */
return toplevel; return toplevel;
} }

View File

@ -336,7 +336,8 @@ gtk_im_context_thai_filter_keypress (GtkIMContext *context,
if (is_reject) if (is_reject)
{ {
/* reject character */ /* reject character */
gdk_beep (); GdkDisplay *display = gdk_display_get_default ();
gdk_display_beep (display);
} }
return TRUE; return TRUE;
} }

View File

@ -168,7 +168,7 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
GError *error = NULL; GError *error = NULL;
GdkScreen *screen; GdkMonitor *monitor;
GdkRectangle monitor_bounds; GdkRectangle monitor_bounds;
GOptionContext *context = g_option_context_new (NULL); GOptionContext *context = g_option_context_new (NULL);
@ -204,10 +204,8 @@ main(int argc, char **argv)
G_CALLBACK (on_map_event), NULL); G_CALLBACK (on_map_event), NULL);
on_frame (0.); on_frame (0.);
screen = gtk_widget_get_screen (window); monitor = gdk_display_get_primary_monitor (gtk_widget_get_display (window));
gdk_screen_get_monitor_geometry (screen, gdk_monitor_get_geometry (monitor, &monitor_bounds);
gdk_screen_get_primary_monitor (screen),
&monitor_bounds);
gtk_window_move (GTK_WINDOW (window), gtk_window_move (GTK_WINDOW (window),
monitor_bounds.x + (monitor_bounds.width - window_width) / 2, monitor_bounds.x + (monitor_bounds.width - window_width) / 2,