diff options
| author | monsta <[email protected]> | 2018-01-28 19:57:20 +0300 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-01-29 21:14:28 +0100 |
| commit | 2611e01e644e4a44aec8189bfbcd437bbb27051e (patch) | |
| tree | 9350a0f0c1389dcff697567850539a01e7191756 /src/terminal-window.c | |
| parent | 2b454bbabcb0dd7c37fe2856c1020ba18e38e038 (diff) | |
| download | mate-terminal-2611e01e644e4a44aec8189bfbcd437bbb27051e.tar.bz2 mate-terminal-2611e01e644e4a44aec8189bfbcd437bbb27051e.tar.xz | |
require GTK+ 3.22 and GLib 2.50
and drop additional checks for min/max GLib versions, it's not needed
Diffstat (limited to 'src/terminal-window.c')
| -rw-r--r-- | src/terminal-window.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/terminal-window.c b/src/terminal-window.c index 734fab3..3f0a234 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -577,13 +577,8 @@ position_menu_under_widget (GtkMenu *menu, GtkRequisition req; GtkRequisition menu_req; GdkRectangle monitor; -#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor_num; GdkDisplay *display; -#else - int monitor_num; - GdkScreen *screen; -#endif GtkAllocation widget_allocation; widget_window = gtk_widget_get_window (widget); @@ -593,19 +588,11 @@ position_menu_under_widget (GtkMenu *menu, gtk_widget_get_preferred_size (widget, &req, NULL); gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL); -#if GTK_CHECK_VERSION (3, 22, 0) display = gtk_widget_get_display (GTK_WIDGET (menu)); monitor_num = gdk_display_get_monitor_at_window (display, widget_window); if (monitor_num == NULL) monitor_num = gdk_display_get_monitor (display, 0); gdk_monitor_get_geometry (monitor_num, &monitor); -#else - screen = gtk_widget_get_screen (GTK_WIDGET (menu)); - monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window); - if (monitor_num < 0) - monitor_num = 0; - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); -#endif gdk_window_get_origin (widget_window, x, y); if (!gtk_widget_get_has_window (widget)) @@ -2656,7 +2643,6 @@ terminal_window_remove_screen (TerminalWindow *window, update_tab_visibility (window, -1); screen_container = terminal_screen_container_get_from_screen (screen); -#if GTK_CHECK_VERSION(3, 16, 0) if (detach_tab) { gtk_notebook_detach_tab (GTK_NOTEBOOK (priv->notebook), @@ -2666,10 +2652,6 @@ terminal_window_remove_screen (TerminalWindow *window, else gtk_container_remove (GTK_CONTAINER (priv->notebook), GTK_WIDGET (screen_container)); -#else - gtk_container_remove (GTK_CONTAINER (priv->notebook), - GTK_WIDGET (screen_container)); -#endif } void @@ -4242,12 +4224,8 @@ terminal_set_title_callback (GtkAction *action, gtk_box_pack_start (GTK_BOX (message_area), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic (_("_Title:")); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -#endif gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry = gtk_entry_new (); |