Merge branch 'main' into beta

aseprite · Nov 6, 2024 · 1ddaf36 · 1ddaf36
2 parents 57c2646 + 5ec00f5
commit 1ddaf36
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
@@ -90,7 +90,26 @@ if(WIN32)
     # We only support the Unicode API
     UNICODE _UNICODE)
 
-  target_compile_definitions(laf-base PRIVATE _CRT_SECURE_NO_WARNINGS)
+  if(MSVC)
+    target_compile_options(laf-base PUBLIC
+      # Disable warnings about possible loss of data
+      -wd4244
+
+      # Disable warnings about conversion from size_t to int
+      -wd4267
+
+      # Disable warning about using 'this' used in base member initializer list
+      -wd4355
+
+      # Disable function not inlined (generated by MSVC header files)
+      -wd4710
+
+      # Avoid warnings about usage of insecure standard C library
+      # functions and C++ STL functions
+      -D_CRT_SECURE_NO_WARNINGS
+      -D_SCL_SECURE_NO_WARNINGS)
+  endif()
+
   target_link_libraries(laf-base dbghelp shlwapi version)
 else()
   if(APPLE)

diff --git a/gfx/path_skia.h b/gfx/path_skia.h
@@ -14,11 +14,6 @@
 
 #include "include/core/SkPath.h"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4244) // 'argument': conversion from 'T' to 'SkScalar', possible loss of data
-#endif
-
 namespace gfx {
 
   // Simple wrapper for SkPath
@@ -119,8 +114,4 @@ namespace gfx {
 
 } // namespace gfx
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #endif
diff --git a/os/skia/skia_system.h b/os/skia/skia_system.h
@@ -66,8 +66,8 @@ class SkiaSystem final : public SkiaSystemBase {
   }
 
   void setTabletOptions(const TabletOptions& options) override {
-#if LAF_WINDOWS
     SkiaSystemBase::setTabletOptions(options);
+#if LAF_WINDOWS
     if (SkiaWindow* window = dynamic_cast<SkiaWindow*>(defaultWindow())) {
       // TODO notify all windows
       window->onTabletOptionsChange();

diff --git a/os/win/dnd.cpp b/os/win/dnd.cpp
@@ -273,7 +273,6 @@ bool DragDataProviderWin::contains(DragDataItemType type)
   UINT urlFormat = RegisterClipboardFormat(CFSTR_INETURL);
   UINT pngFormat = RegisterClipboardFormat(L"PNG");
   UINT fileDescriptorFormat = RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR);
-  char name[101];
   FORMATETC fmt;
   while (formats->Next(1, &fmt, nullptr) == S_OK) {
     switch (fmt.cfFormat) {