Merge branch 'main' into beta

dacap · Apr 23, 2024 · 4b8f3ef · 4b8f3ef
2 parents 9657032 + 4b6e6dc
commit 4b8f3ef
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
@@ -1,5 +1,5 @@
 # LAF Base Library
-# Copyright (c) 2019-2023 Igara Studio S.A.
+# Copyright (c) 2019-2024 Igara Studio S.A.
 # Copyright (c) 2001-2018 David Capello
 
 include(CheckIncludeFiles)
@@ -94,6 +94,8 @@ if(WIN32)
   target_link_libraries(laf-base dbghelp shlwapi version)
 else()
   if(APPLE)
+    target_compile_options(laf-base PRIVATE -fobjc-arc)
+
     find_library(FOUNDATION_LIBRARY Foundation)
     target_compile_definitions(laf-base PUBLIC LAF_MACOS)
     target_link_libraries(laf-base ${FOUNDATION_LIBRARY})

diff --git a/base/win/registry_tests.cpp b/base/win/registry_tests.cpp
@@ -1,4 +1,5 @@
 // LAF Base Library
+// Copyright (c) 2024 Igara Studio S.A.
 // Copyright (c) 2017 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -16,7 +17,8 @@ TEST(Registry, OpenKey)
   try {
     hkey k = hkey::classes_root();
     k = k.open(".txt", hkey::read);
-    EXPECT_EQ("txtfile", k.string(""));
+    EXPECT_TRUE(k.string("") == "txtfile" ||
+                k.string("") == "txtfilelegacy");
     EXPECT_EQ("text/plain", k.string("Content Type"));
   }
   catch (Win32Exception& ex) {

diff --git a/clip b/clip
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -23,7 +23,7 @@ if(LAF_BACKEND STREQUAL "skia")
   laf_add_example(complextextlayout GUI)
   laf_add_example(custom_window GUI)
   laf_add_example(floating_window GUI)
-  laf_add_example(helloworld GUI)
+  laf_add_example(hello_laf GUI)
   laf_add_example(multiple_windows GUI)
   laf_add_example(panviewport GUI)
   laf_add_example(shader GUI)

diff --git a/examples/helloworld.cpp → examples/hello_laf.cpp b/examples/helloworld.cpp → examples/hello_laf.cpp