From bd5c7015d4fc692dd0509f0da7d104c0bea71cd5 Mon Sep 17 00:00:00 2001
From: Johann Rudloff <johann@sinyax.net>
Date: Thu, 6 Jan 2022 07:55:46 +0100
Subject: [PATCH] =?UTF-8?q?Remove=20use=20of=20deprecated=20gtkmm-2.4=20AP?=
 =?UTF-8?q?I,=20require=20gtkmm-2.4=20=E2=89=A5=202.18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt           | 2 +-
 src/Application.cpp      | 7 +++----
 src/SimulationCanvas.cpp | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b09c19b..0fb3ff9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ include(FindGettext)
 include(FindPkgConfig)
 include(GNUInstallDirs)
 
-pkg_check_modules(GTKMM REQUIRED gtkmm-2.4>=2.8 librsvg-2.0)
+pkg_check_modules(GTKMM REQUIRED gtkmm-2.4>=2.18 librsvg-2.0)
 
 set (CMAKE_CXX_STANDARD 11)
 
diff --git a/src/Application.cpp b/src/Application.cpp
index 0646450..ba5f611 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -440,17 +440,16 @@ Widget *Application::build_object_toolbar()
   al->add(*manage(tb));
   al->set_padding(2, 2, 0, 0);
 
-  Tooltips *tips = manage(new Tooltips);
   Button *btn;
   Image *img;
 
   btn = manage(new Button);
   img = new Image(Stock::REMOVE, Gtk::ICON_SIZE_SMALL_TOOLBAR);
-  btn->unset_flags(CAN_FOCUS);
+  btn->set_can_focus(false);
   btn->set_image(*manage(img));
   btn->set_relief(RELIEF_NONE);
   btn->signal_clicked().connect(sigc::mem_fun(*this, &Application::on_remove_selected_activate));
-  tips->set_tip(*btn, _("Remove this object"));
+  btn->set_tooltip_text(_("Remove this object"));
   tb->pack_start(*btn, false, false);
 
   int width = img->size_request().width + 4 + 2*btn->get_style()->get_xthickness();
@@ -466,7 +465,7 @@ Widget *Application::build_object_toolbar()
   charge_spin->signal_value_changed().connect(sigc::mem_fun(*this, &Application::on_charge_value_changed));
   charge_spin->set_range(SimulationCanvas::MIN_CHARGE, SimulationCanvas::MAX_CHARGE);
   charge_spin->set_increments(SimulationCanvas::CHARGE_STEP_SMALL, SimulationCanvas::CHARGE_STEP);
-  tips->set_tip(*charge_spin, _("Change the absolute value of this object's charge"));
+  charge_spin->set_tooltip_text(_("Change the absolute value of this object's charge"));
 
   charge_box->pack_start(*charge_spin);
   Alignment *charge_al = manage(new Alignment);
diff --git a/src/SimulationCanvas.cpp b/src/SimulationCanvas.cpp
index e300dba..230994a 100644
--- a/src/SimulationCanvas.cpp
+++ b/src/SimulationCanvas.cpp
@@ -518,7 +518,7 @@ void SimulationCanvas::after_realize_event()
 
   get_pixmap()->draw_rectangle(gc_white, true, 0, 0, get_width(), get_height());
 
-  set_flags(get_flags() | Gtk::CAN_FOCUS);
+  set_can_focus(true);
 }
 
 bool SimulationCanvas::on_configure_event(GdkEventConfigure *event)
-- 
2.34.2