From 4b3ab504c8024e49ff5888a55acc5d4d2928e5e1 Mon Sep 17 00:00:00 2001
From: Milan Nikolic <gen2brain@gmail.com>
Date: Thu, 9 May 2024 17:21:05 +0200
Subject: [PATCH] Update RGFW

---
 raylib/external/RGFW.h                | 56 +++++++++++++--------------
 raylib/platforms/rcore_desktop_rgfw.c |  6 +--
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/raylib/external/RGFW.h b/raylib/external/RGFW.h
index 903642f..11503a2 100644
--- a/raylib/external/RGFW.h
+++ b/raylib/external/RGFW.h
@@ -130,16 +130,12 @@ extern "C" {
 	
 #define RGFW_WINDOWS
 
-#if defined(_WIN32)
-#ifndef WIN32
+#if defined(_WIN32) && !defined(WIN32)
 #define WIN32
 #endif
-#endif
 
 #if defined(_WIN64)
-#ifndef WIN64
-#define WIN64
-#endif
+//#define WIN64
 #define _AMD64_
 #undef _X86_
 #else
@@ -893,13 +889,13 @@ typedef struct { i32 x, y; } RGFW_vector;
 	typedef void NSApplication;
 	typedef void NSScreen;
 	typedef void NSEvent;
-	//typedef void NSString;
+	typedef void NSString;
 	typedef void NSOpenGLContext;
 	typedef void NSPasteboard;
 	typedef void NSColor;
-	//typedef void NSArray;
+	typedef void NSArray;
 	typedef void NSImageRep;
-	//typedef void NSImage;
+	typedef void NSImage;
 	typedef void NSOpenGLView;
 
 
@@ -997,29 +993,29 @@ typedef struct { i32 x, y; } RGFW_vector;
 	/* Creates an Objective-C method (SEL) from a regular C function with the option to set the register name.*/
 #define si_func_to_SEL_with_name(class_name, register_name, function) si_impl_func_to_SEL_with_name(class_name, register_name":", function)
 
-	//NSRect NSMakeRect(double x, double y, double width, double height) {
-		//NSRect r;
-		//r.origin.x = x;
-		//r.origin.y = y;
-		//r.size.width = width;
-		//r.size.height = height;
+	NSRect NSMakeRect(double x, double y, double width, double height) {
+		NSRect r;
+		r.origin.x = x;
+		r.origin.y = y;
+		r.size.width = width;
+		r.size.height = height;
 
-		//return r;
-	//}
+		return r;
+	}
 
-	//NSPoint NSMakePoint(double x, double y) {
-		//NSPoint point;
-		//point.x = x;
-		//point.y = y;
-		//return point;
-	//}
+	NSPoint NSMakePoint(double x, double y) {
+		NSPoint point;
+		point.x = x;
+		point.y = y;
+		return point;
+	}
 
-	//NSSize NSMakeSize(double w, double h) {
-		//NSSize size;
-		//size.width = w;
-		//size.height = h;
-		//return size;
-	//}
+	NSSize NSMakeSize(double w, double h) {
+		NSSize size;
+		size.width = w;
+		size.height = h;
+		return size;
+	}
 
 	void* si_array_init(void* allocator, size_t sizeof_element, size_t count) {
 		void* array = si_array_init_reserve(sizeof_element, count);
@@ -6078,7 +6074,7 @@ static HMODULE wglinstance = NULL;
 	}
 
 	void RGFW_sleep(u32 ms) {
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
+#ifndef RGFW_WINDOWS
 		struct timespec time;
 		time.tv_sec = 0;
 		time.tv_nsec = ms * 1000;
diff --git a/raylib/platforms/rcore_desktop_rgfw.c b/raylib/platforms/rcore_desktop_rgfw.c
index 12e18af..858fd71 100644
--- a/raylib/platforms/rcore_desktop_rgfw.c
+++ b/raylib/platforms/rcore_desktop_rgfw.c
@@ -61,15 +61,11 @@ void CloseWindow(void);
 #define _XTYPEDEF_FONT
 #define RGFW_IMPLEMENTATION
 
-#if defined(_WIN32)
-
 #define WIN32_LEAN_AND_MEAN
 #define Rectangle rectangle_win32
 #define CloseWindow CloseWindow_win32
 #define ShowCursor __imp_ShowCursor
 
-#endif // _WIN32
-
 #define Point NSPOINT
 #define Size NSSIZE
 
@@ -79,11 +75,11 @@ __declspec(dllimport) int __stdcall  MultiByteToWideChar(unsigned int CodePage,
 
 #include "../external/RGFW.h"
 #undef DrawText
+#undef Rectangle
 #undef ShowCursor
 #undef CloseWindow
 #undef Point
 #undef Size
-#undef Rectangle
 
 #define Rectangle struct Rectangle
 void CloseWindow(void);