Merge branch 'gtk3-deprecated' of gitlab.com:Qantas94Heavy/inkscape

4 files changed, 6 insertions, 23 deletions

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<Widget*> _dimTabOrderList;
 
     //### Fit Page options
     Gtk::Expander        _fitPageMarginExpander;
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<const GdkEvent *>(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<const GdkEvent *>(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);