From 842e73d94790a8a23d3a2863746837ba04340dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= <ggarra13@gmail.com>
Date: Sun, 8 Oct 2023 14:37:51 -0300
Subject: [PATCH] Updated to latest FLTK.

---
 cmake/Modules/BuildFLTK.cmake     |  7 +------
 mrv2/lib/mrvFl/mrvPreferences.cpp | 31 -------------------------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake
index 286492f12..26e825232 100644
--- a/cmake/Modules/BuildFLTK.cmake
+++ b/cmake/Modules/BuildFLTK.cmake
@@ -6,12 +6,7 @@ include( ExternalProject )
 
 #set( FLTK_TAG master )
 # Stable TAG
-if (NOT APPLE)
-    #set( FLTK_TAG master )
-    set( FLTK_TAG f6690a974245407c5d266dcb688db694e51a3bb4 )
-else()
-    set( FLTK_TAG c2cce9cba86dcc208c9396af994010cd49484988 )
-endif()
+set( FLTK_TAG f6690a974245407c5d266dcb688db694e51a3bb4 )
 
 
 set( FLTK_BUILD_SHARED_LIBS OFF )
diff --git a/mrv2/lib/mrvFl/mrvPreferences.cpp b/mrv2/lib/mrvFl/mrvPreferences.cpp
index e1cc93e87..6954e503e 100644
--- a/mrv2/lib/mrvFl/mrvPreferences.cpp
+++ b/mrv2/lib/mrvFl/mrvPreferences.cpp
@@ -27,10 +27,6 @@ namespace fs = std::filesystem;
 #    include "mrvNetwork/mrvImageListener.h"
 #endif
 
-#ifndef __APPLE__
-#    define USE_FL_PREFERENCES_FOUR 1
-#endif
-
 #include "mrvFl/mrvPreferences.h"
 #include "mrvFl/mrvHotkey.h"
 #include "mrvFl/mrvLanguages.h"
@@ -134,12 +130,8 @@ namespace mrv
 
         LOG_INFO(msg);
 
-#ifdef USE_FL_PREFERENCES_FOUR
         Fl_Preferences base(
             prefspath().c_str(), "filmaura", "mrv2", Fl_Preferences::C_LOCALE);
-#else
-        Fl_Preferences base(prefspath().c_str(), "filmaura", "mrv2");
-#endif
 
         base.get("version", version, 7);
 
@@ -697,14 +689,9 @@ namespace mrv
         uiPrefs->uiPrefsMaxImagesApart->value(tmp);
 
         char key[256];
-#ifdef USE_FL_PREFERENCES_FOUR
         Fl_Preferences path_mapping(
             prefspath().c_str(), "filmaura", "mrv2.paths",
             Fl_Preferences::C_LOCALE);
-#else
-        Fl_Preferences path_mapping(
-            prefspath().c_str(), "filmaura", "mrv2.paths");
-#endif
         num = path_mapping.entries();
         for (int i = 0; i < num; ++i)
         {
@@ -927,14 +914,10 @@ namespace mrv
             visible = 1;
         settingsObject->setValue("gui/DockGroup/Visible", visible);
 
-#ifdef USE_FL_PREFERENCES_FOUR
         Fl_Preferences base(
             prefspath().c_str(), "filmaura", "mrv2",
             (Fl_Preferences::Root)(
                 (int)Fl_Preferences::C_LOCALE | (int)Fl_Preferences::CLEAR));
-#else
-        Fl_Preferences base(prefspath().c_str(), "filmaura", "mrv2");
-#endif
         base.set("version", 7);
 
         Fl_Preferences fltk_settings(base, "settings");
@@ -1254,15 +1237,10 @@ namespace mrv
             "max_images_apart", (int)uiPrefs->uiPrefsMaxImagesApart->value());
 
         char key[256];
-#ifdef USE_FL_PREFERENCES_FOUR
         Fl_Preferences path_mapping(
             prefspath().c_str(), "filmaura", "mrv2.paths",
             (Fl_Preferences::Root)(
                 (int)Fl_Preferences::C_LOCALE | (int)Fl_Preferences::CLEAR));
-#else
-        Fl_Preferences path_mapping(
-            prefspath().c_str(), "filmaura", "mrv2.paths");
-#endif
         path_mapping.clear();
         for (int i = 2; i <= uiPrefs->PathMappings->size(); ++i)
         {
@@ -1309,16 +1287,11 @@ namespace mrv
 
         {
 
-#ifdef USE_FL_PREFERENCES_FOUR
             Fl_Preferences keys(
                 prefspath().c_str(), "filmaura", hotkeys_file.c_str(),
                 (Fl_Preferences::Root)(
                     (int)Fl_Preferences::C_LOCALE |
                     (int)Fl_Preferences::CLEAR));
-#else
-            Fl_Preferences keys(
-                prefspath().c_str(), "filmaura", hotkeys_file.c_str());
-#endif
             save_hotkeys(keys);
 
             msg = tl::string::Format(
@@ -1748,12 +1721,8 @@ namespace mrv
             }
         }
 
-#ifdef USE_FL_PREFERENCES_FOUR
         Fl_Preferences base(
             prefspath().c_str(), "filmaura", "mrv2", Fl_Preferences::C_LOCALE);
-#else
-        Fl_Preferences base(prefspath().c_str(), "filmaura", "mrv2");
-#endif
         Fl_Preferences gui(base, "ui");
         gui.set("single_instance", uiPrefs->uiPrefsSingleInstance->value());
         gui.set(