Merge with 'Beep6581/dev'

2023-09-05 09:48:43 +02:00
parent d8c0b521ab 7c73da7723
commit 990e9c70a5
91 changed files with 1524 additions and 1157 deletions
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -17,7 +17,7 @@
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <iomanip>
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif

@@ -1499,7 +1499,7 @@ void CropWindow::expose (Cairo::RefPtr<Cairo::Context> cr)

            // While the Right-side ALT is pressed, auto-enable highlight and shadow clipping indicators
            // TODO: Add linux/MacOS specific functions for alternative
-#ifdef WIN32
+#ifdef _WIN32

            if (GetKeyState(VK_RMENU) < 0) {
                showcs = true;