diff --git a/borrowed/goffice/go-optionmenu.c b/borrowed/goffice/go-optionmenu.c index e4b350bc48..4e0ba1b656 100644 --- a/borrowed/goffice/go-optionmenu.c +++ b/borrowed/goffice/go-optionmenu.c @@ -106,67 +106,6 @@ static void go_option_menu_select_item(GOOptionMenu *option_menu, go_option_menu_update_contents(option_menu); } -#if !GTK_CHECK_VERSION(3,22,0) -static void go_option_menu_position(GtkMenu *menu, gint *x, gint *y, - gboolean *push_in, gpointer user_data) -{ - GOOptionMenu *option_menu = user_data; - GtkWidget *widget; - GtkRequisition requisition; - GList *children; - gint screen_width; - gint menu_xpos; - gint menu_ypos; - gint menu_width; - GtkAllocation allocation; - - widget = GTK_WIDGET(option_menu); - - gtk_widget_get_preferred_size(GTK_WIDGET(menu), &requisition, NULL); - menu_width = requisition.width; - - gdk_window_get_origin(gtk_widget_get_window(widget), &menu_xpos, - &menu_ypos); - - gtk_widget_get_allocation(widget, &allocation); - menu_xpos += allocation.x; - menu_ypos += allocation.y + allocation.height / 2 - 2; - - children = gtk_container_get_children(GTK_CONTAINER(option_menu->menu)); - while (children) - { - GtkWidget *child = children->data; - - if (GTK_IS_CHECK_MENU_ITEM(child) - && gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(child))) - { - gtk_widget_get_preferred_size(child, &requisition, NULL); - menu_ypos -= requisition.height / 2; - break; - } - - if (gtk_widget_get_visible(child)) - { - gtk_widget_get_preferred_size(child, &requisition, NULL); - menu_ypos -= requisition.height; - } - - children = children->next; - } - - screen_width = gdk_screen_get_width(gtk_widget_get_screen(widget)); - - if (menu_xpos + menu_width > screen_width) - menu_xpos -= (menu_xpos + menu_width) - screen_width; - if (menu_xpos < 0) - menu_xpos = 0; - - *x = menu_xpos; - *y = menu_ypos; - *push_in = TRUE; -} -#endif - static gint go_option_menu_button_press(GtkWidget *widget, GdkEventButton *event) { @@ -179,21 +118,13 @@ static gint go_option_menu_button_press(GtkWidget *widget, if (event->type == GDK_BUTTON_PRESS && event->button == 1) { -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_widget (GTK_MENU(option_menu->menu), widget, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, (GdkEvent *) event); -#else - gtk_menu_popup(GTK_MENU(option_menu->menu), NULL, NULL, - go_option_menu_position, option_menu, event->button, - event->time); - -#endif return TRUE; } - return FALSE; } @@ -205,16 +136,11 @@ static gint go_option_menu_key_press(GtkWidget *widget, GdkEventKey *event) { case GDK_KEY_KP_Space: case GDK_KEY_space: -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_widget (GTK_MENU(option_menu->menu), widget, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, (GdkEvent *) event); -#else - gtk_menu_popup(GTK_MENU(option_menu->menu), NULL, NULL, - go_option_menu_position, option_menu, 0, event->time); -#endif return TRUE; } diff --git a/gnucash/gnome-utils/dialog-utils.c b/gnucash/gnome-utils/dialog-utils.c index c5473708f1..25526b21d1 100644 --- a/gnucash/gnome-utils/dialog-utils.c +++ b/gnucash/gnome-utils/dialog-utils.c @@ -112,26 +112,15 @@ gnc_restore_window_size(const char *group, GtkWindow *window, GtkWindow *parent) if (g_variant_is_of_type (geometry, (const GVariantType *) "(iiii)") ) { GdkRectangle monitor_size; - -#if GTK_CHECK_VERSION(3,22,0) GdkDisplay *display = gdk_display_get_default (); GdkMonitor *mon; -#else - GdkScreen *screen = gdk_screen_get_default (); - gint mon_num; -#endif g_variant_get (geometry, "(iiii)", &wpos[0], &wpos[1], &wsize[0], &wsize[1]); -#if GTK_CHECK_VERSION(3,22,0) mon = gdk_display_get_monitor_at_point (display, wpos[0], wpos[1]); gdk_monitor_get_geometry (mon, &monitor_size); -#else - mon_num = gdk_screen_get_monitor_at_point (screen, wpos[0], wpos[1]); - gdk_screen_get_monitor_geometry (screen, mon_num, &monitor_size); -#endif DEBUG("monitor left top corner x: %d, y: %d, width: %d, height: %d", monitor_size.x, monitor_size.y, monitor_size.width, monitor_size.height); @@ -245,19 +234,13 @@ gnc_save_window_size(const char *group, GtkWindow *window) void gnc_window_adjust_for_screen(GtkWindow * window) { + GdkDisplay *display = gdk_display_get_default (); + GdkMonitor *mon; GdkRectangle monitor_size; gint wpos[2]; gint width; gint height; -#if GTK_CHECK_VERSION(3,22,0) - GdkDisplay *display = gdk_display_get_default (); - GdkMonitor *mon; -#else - GdkScreen *screen = gdk_screen_get_default (); - gint mon_num; -#endif - ENTER(""); if (window == NULL) @@ -270,13 +253,8 @@ gnc_window_adjust_for_screen(GtkWindow * window) gtk_window_get_position(GTK_WINDOW(window), &wpos[0], &wpos[1]); gtk_window_get_size(GTK_WINDOW(window), &width, &height); -#if GTK_CHECK_VERSION(3,22,0) mon = gdk_display_get_monitor_at_point (display, wpos[0], wpos[1]); gdk_monitor_get_geometry (mon, &monitor_size); -#else - mon_num = gdk_screen_get_monitor_at_point (screen, wpos[0], wpos[1]); - gdk_screen_get_monitor_geometry (screen, mon_num, &monitor_size); -#endif DEBUG("monitor width is %d, height is %d; wwindow width is %d, height is %d", monitor_size.width, monitor_size.height, width, height); diff --git a/gnucash/gnome-utils/gnc-cell-renderer-popup.c b/gnucash/gnome-utils/gnc-cell-renderer-popup.c index d170d1f2bb..43dc4a5ff5 100644 --- a/gnucash/gnome-utils/gnc-cell-renderer-popup.c +++ b/gnucash/gnome-utils/gnc-cell-renderer-popup.c @@ -218,46 +218,20 @@ gcrp_grab_on_window (GdkWindow *window, guint32 activate_time) { GdkDisplay *display = gdk_display_get_default (); -#if GTK_CHECK_VERSION(3,20,0) GdkSeat *seat; -#else - GdkDeviceManager *device_manager; - GdkDevice *device; -#endif - -#if GTK_CHECK_VERSION(3,20,0) GdkEvent *event = gtk_get_current_event (); -#endif -#if GTK_CHECK_VERSION(3,20,0) seat = gdk_display_get_default_seat (display); -#else - device_manager = gdk_display_get_device_manager (display); - device = gdk_device_manager_get_client_pointer (device_manager); -#endif -#if GTK_CHECK_VERSION(3,20,0) if ((gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_POINTER, TRUE, NULL, - event, NULL, NULL) == GDK_GRAB_SUCCESS )) { + event, NULL, NULL) == GDK_GRAB_SUCCESS)) + { if (gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_KEYBOARD, TRUE, NULL, - event, NULL, NULL) == GDK_GRAB_SUCCESS ) -#else - if ((gdk_device_grab (device, window, GDK_OWNERSHIP_WINDOW, TRUE, - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK, - NULL, activate_time) == GDK_GRAB_SUCCESS)) { - - if (gdk_device_grab (device, window, GDK_OWNERSHIP_WINDOW, TRUE, - GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, - NULL, activate_time) == GDK_GRAB_SUCCESS) -#endif + event, NULL, NULL) == GDK_GRAB_SUCCESS) return TRUE; - else { -#if GTK_CHECK_VERSION(3,20,0) + else + { gdk_seat_ungrab (seat); -#else - gdk_device_ungrab (device, activate_time); -#endif return FALSE; } } @@ -272,11 +246,9 @@ gcrp_show_popup (GncCellRendererPopup *cell, gint x2, gint y2) { -#if GTK_CHECK_VERSION(3,22,0) - GdkWindow *win; - GdkMonitor *mon; - GdkRectangle monitor_size; -#endif + GdkWindow *win; + GdkMonitor *mon; + GdkRectangle monitor_size; GtkAllocation alloc; gint x, y; gint screen_height, screen_width; @@ -299,17 +271,12 @@ gcrp_show_popup (GncCellRendererPopup *cell, button_height = y2 - y1; -#if GTK_CHECK_VERSION(3,22,0) win = gdk_screen_get_root_window (gtk_window_get_screen (GTK_WINDOW(cell->popup_window))); mon = gdk_display_get_monitor_at_window (gtk_widget_get_display (GTK_WIDGET(cell->popup_window)), win); gdk_monitor_get_geometry (mon, &monitor_size); screen_width = monitor_size.width; screen_height = monitor_size.height - y; -#else - screen_width = gdk_screen_width(); - screen_height = gdk_screen_height() - y; -#endif /* Check if it fits in the available height. */ if (alloc.height > screen_height) diff --git a/gnucash/gnome-utils/gnc-combott.c b/gnucash/gnome-utils/gnc-combott.c index f0e3595728..2be7adc972 100644 --- a/gnucash/gnome-utils/gnc-combott.c +++ b/gnucash/gnome-utils/gnc-combott.c @@ -93,14 +93,6 @@ static void gnc_combott_get_property (GObject *object, static void gnc_combott_finalize (GObject *object); -#if !GTK_CHECK_VERSION(3,22,0) -static void gnc_combott_menu_position (GtkMenu *menu, - gint *x, - gint *y, - gint *push_in, - gpointer user_data); -#endif - static void gnc_combott_changed (GncCombott *combott); static void gnc_combott_set_model (GncCombott *combott, GtkTreeModel *model); static void gnc_combott_refresh_menu (GncCombott *combott, GtkTreeModel *model); @@ -441,61 +433,6 @@ gnc_combott_changed(GncCombott *combott) } -#if !GTK_CHECK_VERSION(3,22,0) -static void -gnc_combott_menu_position (GtkMenu *menu, - gint *x, - gint *y, - gint *push_in, - gpointer user_data) -{ - GncCombott *combott = GNC_COMBOTT (user_data); - GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott); - gint sx, sy; - GtkWidget *child; - GtkRequisition req; - GtkAllocation alloc; - GtkBorder padding; - GtkStyleContext *sc = gtk_widget_get_style_context (GTK_WIDGET (priv->button)); - GtkStateFlags state_flags = gtk_style_context_get_state (sc); - - child = gtk_bin_get_child (GTK_BIN (priv->button)); - - sx = sy = 0; - - if (!gtk_widget_get_has_window (child)) - { - gtk_widget_get_allocation (child, &alloc); - sx += alloc.x; - sy += alloc.y; - } - - gdk_window_get_root_coords (gtk_widget_get_window (child), sx, sy, &sx, &sy); - - gtk_style_context_get_padding (sc, state_flags, &padding); - - sx -= padding.left; - - gtk_widget_get_preferred_size (GTK_WIDGET (menu), &req, NULL); - - if (gtk_widget_get_direction (GTK_WIDGET (priv->button)) == GTK_TEXT_DIR_LTR) - *x = sx; - else - { - gtk_widget_get_allocation (child, &alloc); - *x = sx + alloc.width - req.width; - } - - if(priv->active == -1 || priv->active == 0) - *y = sy; - else - *y = sy - ((req.height / priv->num_items) * (priv->active - 1)); - - *push_in = FALSE; -} -#endif - - static void button_getsize_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer *user_data) { @@ -557,20 +494,11 @@ button_press_cb (GtkWidget *widget, GdkEvent *event, gpointer *user_data ) { if (event->type == GDK_BUTTON_PRESS) { - GdkEventButton *bevent = (GdkEventButton *) event; - -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_widget (GTK_MENU(priv->menu), widget, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, event); -#else - gtk_menu_popup (GTK_MENU (priv->menu), - NULL, NULL, - gnc_combott_menu_position, combott, - bevent->button, bevent->time); -#endif /* Tell calling code that we have handled this event; the buck * stops here. */ diff --git a/gnucash/gnome-utils/gnc-date-edit.c b/gnucash/gnome-utils/gnc-date-edit.c index 47a9563780..06d9ea8f0a 100644 --- a/gnucash/gnome-utils/gnc-date-edit.c +++ b/gnucash/gnome-utils/gnc-date-edit.c @@ -147,33 +147,21 @@ gnc_strtok_r (char *s, const char *delim, char **save_ptr) static void gnc_date_edit_popdown(GNCDateEdit *gde) { -#if GTK_CHECK_VERSION(3,20,0) GdkSeat *seat; -#else - GdkDeviceManager *device_manager; -#endif GdkDevice *pointer; g_return_if_fail (GNC_IS_DATE_EDIT (gde)); ENTER("gde %p", gde); -#if GTK_CHECK_VERSION(3,20,0) seat = gdk_display_get_default_seat (gdk_display_get_default()); pointer = gdk_seat_get_pointer (seat); -#else - device_manager = gdk_display_get_device_manager (gdk_display_get_default()); - pointer = gdk_device_manager_get_client_pointer (device_manager); -#endif gtk_grab_remove (gde->cal_popup); gtk_widget_hide (gde->cal_popup); + if (pointer) -#if GTK_CHECK_VERSION(3,20,0) gdk_seat_ungrab (seat); -#else - gdk_device_ungrab (pointer, GDK_CURRENT_TIME); -#endif gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gde->date_button), FALSE); @@ -265,39 +253,20 @@ popup_grab_on_window (GdkWindow *window, GdkDevice *pointer, guint32 activate_time) { - -#if GTK_CHECK_VERSION(3,20,0) GdkDisplay *display = gdk_display_get_default (); GdkSeat *seat = gdk_display_get_default_seat (display); GdkEvent *event = gtk_get_current_event (); if (keyboard && gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_KEYBOARD, TRUE, NULL, - event, NULL, NULL) != GDK_GRAB_SUCCESS ) -#else - if (keyboard && gdk_device_grab (keyboard, window, - GDK_OWNERSHIP_WINDOW, TRUE, - GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, - NULL, activate_time) != GDK_GRAB_SUCCESS) -#endif + event, NULL, NULL) != GDK_GRAB_SUCCESS) return FALSE; -#if GTK_CHECK_VERSION(3,20,0) if (pointer && gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_POINTER, TRUE, NULL, - event, NULL, NULL) != GDK_GRAB_SUCCESS ) -#else - if (pointer && gdk_device_grab (pointer, window, - GDK_OWNERSHIP_WINDOW, TRUE, - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK, - NULL, activate_time) != GDK_GRAB_SUCCESS) -#endif + event, NULL, NULL) != GDK_GRAB_SUCCESS) { if (keyboard) -#if GTK_CHECK_VERSION(3,20,0) gdk_seat_ungrab (seat); -#else - gdk_device_ungrab (keyboard, activate_time); -#endif + return FALSE; } return TRUE; diff --git a/gnucash/gnome-utils/gnc-dense-cal.c b/gnucash/gnome-utils/gnc-dense-cal.c index e24bf97426..1fd79247f9 100644 --- a/gnucash/gnome-utils/gnc-dense-cal.c +++ b/gnucash/gnome-utils/gnc-dense-cal.c @@ -993,10 +993,8 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal) gtk_style_context_save (stylectxt); gtk_style_context_add_class (stylectxt, marker_color_class); -#if GTK_CHECK_VERSION(3,22,0) gtk_style_context_add_class (stylectxt, GTK_STYLE_CLASS_VIEW); gtk_style_context_set_state (stylectxt, GTK_STATE_FLAG_SELECTED); -#endif for (i = 0; i < dcal->numMarks; i++) { @@ -1250,27 +1248,18 @@ static gint gnc_dense_cal_button_press(GtkWidget *widget, GdkEventButton *evt) { -#if GTK_CHECK_VERSION(3,22,0) GdkWindow *win = gdk_screen_get_root_window (gtk_widget_get_screen (widget)); GdkMonitor *mon = gdk_display_get_monitor_at_window (gtk_widget_get_display (widget), win); GdkRectangle work_area_size; -#else - GdkScreen *screen = gdk_screen_get_default (); -#endif GtkAllocation alloc; GncDenseCal *dcal = GNC_DENSE_CAL(widget); gint win_xpos = evt->x_root + 5; gint win_ypos = evt->y_root + 5; -#if GTK_CHECK_VERSION(3,22,0) gdk_monitor_get_workarea (mon, &work_area_size); dcal->screen_width = work_area_size.width; dcal->screen_height = work_area_size.height; -#else - dcal->screen_width = gdk_screen_get_width (screen); - dcal->screen_height = gdk_screen_get_height (screen); -#endif dcal->doc = wheres_this(dcal, evt->x, evt->y); dcal->showPopup = ~(dcal->showPopup); @@ -1325,13 +1314,8 @@ gnc_dense_cal_motion_notify(GtkWidget *widget, /* As per https://www.gtk.org/tutorial/sec-eventhandling.html */ if (event->is_hint) { -#if GTK_CHECK_VERSION(3,20,0) GdkSeat *seat = gdk_display_get_default_seat (gdk_window_get_display (event->window)); GdkDevice *pointer = gdk_seat_get_pointer (seat); -#else - GdkDeviceManager *device_manager = gdk_display_get_device_manager (gdk_window_get_display (event->window)); - GdkDevice *pointer = gdk_device_manager_get_client_pointer (device_manager); -#endif gdk_window_get_device_position (event->window, pointer, &unused, &unused, &unused2); } diff --git a/gnucash/gnome-utils/gnc-gnome-utils.c b/gnucash/gnome-utils/gnc-gnome-utils.c index 7e893de97d..17ff069184 100644 --- a/gnucash/gnome-utils/gnc-gnome-utils.c +++ b/gnucash/gnome-utils/gnc-gnome-utils.c @@ -410,11 +410,9 @@ gnc_gnome_help (const char *file_name, const char *anchor) uri = g_strconcat ("ghelp:", file_name, NULL); DEBUG ("Attempting to opening help uri %s", uri); -#if GTK_CHECK_VERSION(3,22,0) + success = gtk_show_uri_on_window (NULL, uri, gtk_get_current_event_time (), &error); -#else - success = gtk_show_uri (NULL, uri, gtk_get_current_event_time (), &error); -#endif + g_free (uri); if (success) return; @@ -507,11 +505,9 @@ gnc_launch_assoc (GtkWindow *parent, const char *uri) return; DEBUG ("Attempting to open uri %s", uri); -#if GTK_CHECK_VERSION(3,22,0) + success = gtk_show_uri_on_window (NULL, uri, gtk_get_current_event_time (), &error); -#else - success = gtk_show_uri (NULL, uri, gtk_get_current_event_time (), &error); -#endif + if (success) return; diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c index a9ab385788..8dfc6cb93b 100644 --- a/gnucash/gnome-utils/gnc-main-window.c +++ b/gnucash/gnome-utils/gnc-main-window.c @@ -4825,7 +4825,6 @@ do_popup_menu(GncPluginPage *page, GdkEventButton *event) { GtkUIManager *ui_merge; GtkWidget *menu; - int button, event_time; g_return_if_fail(GNC_IS_PLUGIN_PAGE(page)); @@ -4843,22 +4842,8 @@ do_popup_menu(GncPluginPage *page, GdkEventButton *event) LEAVE("no menu"); return; } - -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event); -#else - if (event) - { - button = event->button; - event_time = event->time; - } - else - { - button = 0; - event_time = gtk_get_current_event_time (); - } - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, event_time); -#endif + LEAVE(" "); } diff --git a/gnucash/gnome-utils/gnc-tree-view.c b/gnucash/gnome-utils/gnc-tree-view.c index 6735fe23d3..27a765dc95 100644 --- a/gnucash/gnome-utils/gnc-tree-view.c +++ b/gnucash/gnome-utils/gnc-tree-view.c @@ -279,11 +279,8 @@ gnc_tree_view_init (GncTreeView *view, void *data) priv->column_menu_icon_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_homogeneous (GTK_BOX(priv->column_menu_icon_box), FALSE); -#if GTK_CHECK_VERSION(3,12,0) gtk_widget_set_margin_start (GTK_WIDGET(icon), 5); -#else - gtk_widget_set_margin_left (GTK_WIDGET(icon), 5); -#endif + gtk_box_pack_end (GTK_BOX(priv->column_menu_icon_box), icon, FALSE, FALSE, 0); sep = gtk_separator_new (GTK_ORIENTATION_VERTICAL); @@ -1405,12 +1402,7 @@ gnc_tree_view_select_column_cb (GtkTreeViewColumn *column, gtk_widget_show_all (menu); /* Pop the menu up at the button */ -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_pointer (GTK_MENU(priv->column_menu), NULL); -#else - gtk_menu_popup (GTK_MENU(priv->column_menu), NULL, GTK_WIDGET(menu), - NULL, NULL, 0, gtk_get_current_event_time ()); -#endif } diff --git a/gnucash/gnome/reconcile-view.c b/gnucash/gnome/reconcile-view.c index d600bca9c7..c97d29ab4d 100644 --- a/gnucash/gnome/reconcile-view.c +++ b/gnucash/gnome/reconcile-view.c @@ -150,11 +150,7 @@ gnc_reconcile_view_tooltip_cb (GNCQueryView *qview, gint x, gint y, if (keyboard_mode == FALSE) { -#if GTK_CHECK_VERSION(3,20,0) GdkSeat *seat; -#else - GdkDeviceManager *device_manager; -#endif GdkDevice *pointer; GtkWindow *tip_win = NULL; GdkWindow *parent_window; @@ -162,13 +158,9 @@ gnc_reconcile_view_tooltip_cb (GNCQueryView *qview, gint x, gint y, parent_window = gtk_widget_get_parent_window (GTK_WIDGET (qview)); -#if GTK_CHECK_VERSION(3,20,0) seat = gdk_display_get_default_seat (gdk_window_get_display (parent_window)); pointer = gdk_seat_get_pointer (seat); -#else - device_manager = gdk_display_get_device_manager (gdk_window_get_display (parent_window)); - pointer = gdk_device_manager_get_client_pointer (device_manager); -#endif + gdk_window_get_device_position (parent_window, pointer, &cur_x, &cur_y, NULL); gdk_window_get_origin (parent_window, &root_x, &root_y); @@ -189,12 +181,7 @@ gnc_reconcile_view_tooltip_cb (GNCQueryView *qview, gint x, gint y, if (GTK_IS_WINDOW (tip_win)) { -#if GTK_CHECK_VERSION(3,22,0) GdkMonitor *mon; -#else - GdkScreen *screen; - gint monitor_num; -#endif GdkRectangle monitor; GtkRequisition requisition; gint x, y; @@ -204,14 +191,9 @@ gnc_reconcile_view_tooltip_cb (GNCQueryView *qview, gint x, gint y, x = root_x + cur_x + 10; y = root_y + cur_y + 10; -#if GTK_CHECK_VERSION(3,22,0) mon = gdk_display_get_monitor_at_point (gdk_display_get_default(), x, y); gdk_monitor_get_geometry (mon, &monitor); -#else - screen = gtk_widget_get_screen (GTK_WIDGET (qview)); - monitor_num = gdk_screen_get_monitor_at_point (screen, x, y); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); -#endif + if (x + requisition.width > monitor.x + monitor.width) x -= x - (monitor.x + monitor.width) + requisition.width; else if (x < monitor.x) diff --git a/gnucash/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c index 431c3f64c4..01d4710288 100644 --- a/gnucash/gnome/window-reconcile.c +++ b/gnucash/gnome/window-reconcile.c @@ -954,31 +954,12 @@ gnc_reconcile_window_row_cb(GNCReconcileView *view, gpointer item, static void do_popup_menu(RecnWindow *recnData, GdkEventButton *event) { - GtkWidget *menu; - int button, event_time; + GtkWidget *menu = gtk_ui_manager_get_widget (recnData->ui_merge, "/MainPopup"); - menu = gtk_ui_manager_get_widget(recnData->ui_merge, "/MainPopup"); if (!menu) - { return; - } -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event); -#else - if (event) - { - button = event->button; - event_time = event->time; - } - else - { - button = 0; - event_time = gtk_get_current_event_time (); - } - - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, event_time); -#endif } diff --git a/gnucash/gnome/window-reconcile2.c b/gnucash/gnome/window-reconcile2.c index 17650de0d6..1cd02dd71c 100644 --- a/gnucash/gnome/window-reconcile2.c +++ b/gnucash/gnome/window-reconcile2.c @@ -886,31 +886,12 @@ gnc_reconcile_window_row_cb (GNCReconcileView *view, gpointer item, static void do_popup_menu (RecnWindow2 *recnData, GdkEventButton *event) { - GtkWidget *menu; - int button, event_time; + GtkWidget *menu = gtk_ui_manager_get_widget (recnData->ui_merge, "/MainPopup"); - menu = gtk_ui_manager_get_widget (recnData->ui_merge, "/MainPopup"); if (!menu) - { return; - } -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event); -#else - if (event) - { - button = event->button; - event_time = event->time; - } - else - { - button = 0; - event_time = gtk_get_current_event_time (); - } - - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, event_time); -#endif } diff --git a/gnucash/html/gnc-html-webkit2.c b/gnucash/html/gnc-html-webkit2.c index 8dfb6d4415..f776b33ce8 100644 --- a/gnucash/html/gnc-html-webkit2.c +++ b/gnucash/html/gnc-html-webkit2.c @@ -245,15 +245,9 @@ gnc_html_webkit_dispose( GObject* obj ) if ( priv->web_view != NULL ) { - // In Gtk Version 3.20 they relaxed the fact that the widget should be a - // direct child of the container otherwise it would be a critical error -#if GTK_CHECK_VERSION(3,20,0) - gtk_container_remove( GTK_CONTAINER(priv->base.container), - GTK_WIDGET(priv->web_view) ); -#else - GtkWidget *parent = gtk_widget_get_parent(GTK_WIDGET(priv->web_view)); - gtk_container_remove( GTK_CONTAINER(priv->base.container), parent); -#endif + gtk_container_remove (GTK_CONTAINER(priv->base.container), + GTK_WIDGET(priv->web_view)); + priv->web_view = NULL; } diff --git a/gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c b/gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c index b2a5cc7ee0..6c445b1e33 100644 --- a/gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c +++ b/gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c @@ -211,11 +211,5 @@ gnumeric_popup_menu (GtkMenu *menu, GdkEventButton *event) * instead pass 0. Otherwise bringing up a menu with * the right button will disable clicking on the menu with the left. */ -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event); -#else - gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, - (event != NULL) ? event->time - : gtk_get_current_event_time()); -#endif } diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c index 53474891f1..d7d20d6563 100644 --- a/gnucash/import-export/import-main-matcher.c +++ b/gnucash/import-export/import-main-matcher.c @@ -633,16 +633,9 @@ gnc_gen_trans_view_popup_menu (GtkTreeView *treeview, gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); gtk_widget_show_all (menu); event_button = (GdkEventButton *) event; - /* Note: event can be NULL here when called from view_onPopupMenu; - * gdk_event_get_time() accepts a NULL argument */ - /* replace deprecated function for GTK versions >=3.22 */ -#if GTK_CHECK_VERSION(3,22,0) - gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent*)event); -#else - gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, - (event_button != NULL) ? event_button->button : 0, - gdk_event_get_time ((GdkEvent*)event)); -#endif + /* Note: event can be NULL here when called from view_onPopupMenu; */ + gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent*)event); + LEAVE (""); } diff --git a/gnucash/register/register-gnome/gnucash-sheet-private.c b/gnucash/register/register-gnome/gnucash-sheet-private.c index 1980e3e55c..0d36e967b2 100644 --- a/gnucash/register/register-gnome/gnucash-sheet-private.c +++ b/gnucash/register/register-gnome/gnucash-sheet-private.c @@ -702,12 +702,3 @@ gnucash_sheet_draw_cursor (GnucashCursor *cursor, cairo_t *cr) cairo_set_line_width (cr, 1.0); cairo_stroke (cr); } - -void -gnc_widget_add_style_class (GtkWidget *widget, const char *name) -{ -#if !GTK_CHECK_VERSION(3,20,0) - GtkStyleContext *context = gtk_widget_get_style_context (widget); - gtk_style_context_add_class (context, name); -#endif -} diff --git a/gnucash/register/register-gnome/gnucash-sheet.c b/gnucash/register/register-gnome/gnucash-sheet.c index 6c6616ea76..2693245dc1 100644 --- a/gnucash/register/register-gnome/gnucash-sheet.c +++ b/gnucash/register/register-gnome/gnucash-sheet.c @@ -1412,22 +1412,13 @@ gnucash_sheet_check_grab (GnucashSheet *sheet) { GdkModifierType mods; GdkDevice *device; -#if GTK_CHECK_VERSION(3,20,0) GdkSeat *seat; -#else - GdkDeviceManager *device_manager; -#endif if (!sheet->grabbed) return; -#if GTK_CHECK_VERSION(3,20,0) seat = gdk_display_get_default_seat (gdk_display_get_default()); device = gdk_seat_get_pointer (seat); -#else - device_manager = gdk_display_get_device_manager (gdk_display_get_default()); - device = gdk_device_manager_get_client_pointer (device_manager); -#endif gdk_device_get_state (device, gtk_widget_get_window (GTK_WIDGET(sheet)), 0, &mods); @@ -1519,13 +1510,7 @@ gnucash_sheet_button_press_event (GtkWidget *widget, GdkEventButton *event) if (virt_loc_equal (new_virt_loc, cur_virt_loc) && sheet->editing && do_popup) { -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_pointer (GTK_MENU(sheet->popup), (GdkEvent *) event); -#else - gtk_menu_popup(GTK_MENU(sheet->popup), NULL, NULL, NULL, - sheet->popup_data, event->button, event->time); -#endif - return TRUE; } @@ -1548,12 +1533,8 @@ gnucash_sheet_button_press_event (GtkWidget *widget, GdkEventButton *event) gnucash_sheet_check_grab (sheet); if (do_popup) -#if GTK_CHECK_VERSION(3,22,0) gtk_menu_popup_at_pointer (GTK_MENU(sheet->popup), (GdkEvent *) event); -#else - gtk_menu_popup(GTK_MENU(sheet->popup), NULL, NULL, NULL, - sheet->popup_data, event->button, event->time); -#endif + return button_1 || do_popup; } diff --git a/gnucash/register/register-gnome/gnucash-sheetP.h b/gnucash/register/register-gnome/gnucash-sheetP.h index dc9d18e094..bb624af00c 100644 --- a/gnucash/register/register-gnome/gnucash-sheetP.h +++ b/gnucash/register/register-gnome/gnucash-sheetP.h @@ -139,7 +139,5 @@ gboolean gnucash_sheet_draw_internal (GnucashSheet *sheet, cairo_t *cr, GtkAllocation *alloc); void gnucash_sheet_draw_cursor (GnucashCursor *cursor, cairo_t *cr); -void gnc_widget_add_style_class (GtkWidget *widget, const char *name); - /** @} */ #endif