From d1a0590532064daa20732a88360b722f251e8442 Mon Sep 17 00:00:00 2001 From: Karl Cheng Date: Sat, 11 May 2019 20:46:51 +1000 Subject: Replace deprecated Gtk::Menu::popup() -> popup_at_pointer() --- src/ui/widget/spin-button-tool-item.cpp | 17 ++++------------- src/ui/widget/spin-button-tool-item.h | 4 ++-- 2 files changed, 6 insertions(+), 15 deletions(-) (limited to 'src/ui/widget') diff --git a/src/ui/widget/spin-button-tool-item.cpp b/src/ui/widget/spin-button-tool-item.cpp index c21989723..b283939e9 100644 --- a/src/ui/widget/spin-button-tool-item.cpp +++ b/src/ui/widget/spin-button-tool-item.cpp @@ -418,9 +418,9 @@ SpinButtonToolItem::set_icon(const Glib::ustring& icon_name) } bool -SpinButtonToolItem::on_btn_button_press_event(GdkEventButton *button_event) +SpinButtonToolItem::on_btn_button_press_event(const GdkEventButton *button_event) { - if (gdk_event_triggers_context_menu((GdkEvent *)button_event) && + if (gdk_event_triggers_context_menu(reinterpret_cast(button_event)) && button_event->type == GDK_BUTTON_PRESS) { do_popup_menu(button_event); return true; @@ -430,21 +430,12 @@ SpinButtonToolItem::on_btn_button_press_event(GdkEventButton *button_event) } void -SpinButtonToolItem::do_popup_menu(GdkEventButton *button_event) +SpinButtonToolItem::do_popup_menu(const GdkEventButton *button_event) { auto menu = create_numeric_menu(); menu->attach_to_widget(*_btn); menu->show_all(); - - int button = 0; - int time = gtk_get_current_event_time(); - - if (button_event) { - button = button_event->button; - time = button_event->time; - } - - menu->popup(button, time); + menu->popup_at_pointer(reinterpret_cast(button_event)); } /** diff --git a/src/ui/widget/spin-button-tool-item.h b/src/ui/widget/spin-button-tool-item.h index 4386d4799..c073f561c 100644 --- a/src/ui/widget/spin-button-tool-item.h +++ b/src/ui/widget/spin-button-tool-item.h @@ -44,9 +44,9 @@ private: bool on_btn_focus_in_event(GdkEventFocus *focus_event); bool on_btn_focus_out_event(GdkEventFocus *focus_event); bool on_btn_key_press_event(GdkEventKey *key_event); - bool on_btn_button_press_event(GdkEventButton *button_event); + bool on_btn_button_press_event(const GdkEventButton *button_event); bool on_popup_menu(); - void do_popup_menu(GdkEventButton *button_event); + void do_popup_menu(const GdkEventButton *button_event); void defocus(); bool process_tab(int direction); -- cgit v1.2.3 From 89c1effb9a63177251f759bee7c2e76cec06c2cd Mon Sep 17 00:00:00 2001 From: Karl Cheng Date: Wed, 22 May 2019 21:31:09 +1000 Subject: Remove custom tab order in Document Properties The method for handling custom tab order in GTK (set_focus_chain) has been deprecated since GTK 3.24 with no direct replacement. I've decided to remove this code as the code did not seem to make any difference during testing: the tab order appeared to be the same. Regardless, 'Page -> Custom size' in Document Properties is the only place that it's used, so the impact should be fairly limited anyway. --- src/ui/widget/page-sizer.cpp | 7 ------- src/ui/widget/page-sizer.h | 1 - 2 files changed, 8 deletions(-) (limited to 'src/ui/widget') diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index a193f84da..bd7409a0c 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -191,13 +191,6 @@ PageSizer::PageSizer(Registry & _wr) _customDimTable.attach(_fitPageMarginExpander, 0, 1, 3, 1); - _dimTabOrderList.clear(); - _dimTabOrderList.push_back(&_dimensionWidth); - _dimTabOrderList.push_back(&_dimensionHeight); - _dimTabOrderList.push_back(&_dimensionUnits); - _dimTabOrderList.push_back(&_fitPageMarginExpander); - _customDimTable.set_focus_chain(_dimTabOrderList); - //## Set up fit page expander _fitPageMarginExpander.set_use_underline(); _fitPageMarginExpander.set_label(_("Resi_ze page to content...")); diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h index 54ffb9c73..b399835b7 100644 --- a/src/ui/widget/page-sizer.h +++ b/src/ui/widget/page-sizer.h @@ -224,7 +224,6 @@ protected: RegisteredUnitMenu _dimensionUnits; RegisteredScalarUnit _dimensionWidth; RegisteredScalarUnit _dimensionHeight; - std::vector _dimTabOrderList; //### Fit Page options Gtk::Expander _fitPageMarginExpander; -- cgit v1.2.3