From 6b411b67e7fa907785f6f289b8703333205bc817 Mon Sep 17 00:00:00 2001
From: Nicolas Cornu <nicolas.cornu@epfl.ch>
Date: Tue, 22 Oct 2024 11:18:10 +0200
Subject: [PATCH] Remove problem during merge

---
 share/lib/nrn.defaults.in | 12 ++++++------
 src/ivoc/idraw.cpp        |  2 +-
 src/nrnoc/treeset.cpp     |  2 --
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/share/lib/nrn.defaults.in b/share/lib/nrn.defaults.in
index 22049eb11a..332c3e0a83 100755
--- a/share/lib/nrn.defaults.in
+++ b/share/lib/nrn.defaults.in
@@ -78,13 +78,13 @@
 *xvalue_field_size_increase: 10.
 
 // following is historical standard for unix.
-@nrndef_unix@*font: *fixed-medium-r-normal*--14*
-@nrndef_unix@*MenuBar*font: *-fixed-bold-o-normal--14*
-@nrndef_unix@*MenuItem*font: *-fixed-bold-o-normal--14*
+@nrndef_unix@*font: *helvetica-medium-r-normal*--14*
+@nrndef_unix@*MenuBar*font: *-helvetica-bold-o-normal--14*
+@nrndef_unix@*MenuItem*font: *-helvetica-bold-o-normal--14*
 // Mac and mswin internal default is
-@nrndef_mac@*font: *fixed-medium-r-normal*--14*
-@nrndef_mac@*MenuBar*font: *-fixed-bold-o-normal--14*
-@nrndef_mac@*MenuItem*font: *-fixed-bold-o-normal--14*
+@nrndef_mac@*font: *helvetica-medium-r-normal*--14*
+@nrndef_mac@*MenuBar*font: *-helvetica-bold-o-normal--14*
+@nrndef_mac@*MenuItem*font: *-helvetica-bold-o-normal--14*
 @nrndef_mswin@*font: *Arial*bold*--12*
 //*MenuBar*font: *Arial*bold*--12*
 //*MenuItem*font: *Arial*bold*--12*
diff --git a/src/ivoc/idraw.cpp b/src/ivoc/idraw.cpp
index f2798032eb..1216b226d1 100644
--- a/src/ivoc/idraw.cpp
+++ b/src/ivoc/idraw.cpp
@@ -152,7 +152,7 @@ void OcIdraw::text(Canvas*,
         out << font->name() << font->size() << "SetF\n";
     } else {
         out << "\
-%I f -*-fixed-medium-r-normal-*-12-*-*-*-*-*-*-*\n\
+%I f -*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*\n\
 Helvetica 12 SetF\n\
 ";
     };
diff --git a/src/nrnoc/treeset.cpp b/src/nrnoc/treeset.cpp
index be25013db2..f3637addb0 100644
--- a/src/nrnoc/treeset.cpp
+++ b/src/nrnoc/treeset.cpp
@@ -32,8 +32,6 @@
 
 #include <fmt/format.h>
 
-extern spREAL* spGetElement(char*, int, int);
-
 int nrn_shape_changed_; /* for notifying Shape class in nrniv */
 double* nrn_mech_wtime_;